From 20f6c8165d414613127127349755a02500b3e9b3 Mon Sep 17 00:00:00 2001
From: William Kendrick <wkendrick@users.sourceforge.net>
Date: Wed, 27 Apr 2011 20:38:24 +0000
Subject: [PATCH] Left/Right Stamp navigation buttons are purple, like the
 other (up/down) scroll buttons found in Tux Paint.  (SourceForge Bug
 #2918289)

---
 data/images/ui/btn_nav.png | Bin 0 -> 2492 bytes
 docs/CHANGES.txt           |   6 +++++-
 src/tuxpaint.c             |  11 ++++++++---
 3 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 data/images/ui/btn_nav.png

diff --git a/data/images/ui/btn_nav.png b/data/images/ui/btn_nav.png
new file mode 100644
index 0000000000000000000000000000000000000000..684a33511515128ee1b7175d2a61217a89a39e20
GIT binary patch
literal 2492
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
GLSTZl{e<8E

literal 0
HcmV?d00001

diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index 1ba1a150f..772abc925 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -8,7 +8,7 @@ http://www.tuxpaint.org/
 
 $Id$
 
-2011.April.26 (0.9.22)
+2011.April.27 (0.9.22)
   * New Tools:
     ----------
     * Label - A tool to add text to a drawing, which can be modified or
@@ -128,6 +128,10 @@ $Id$
     -------------------
     * Quicker prompt window pop-up animation.
 
+    * Left/Right Stamp navigation buttons are purple, like the other (up/down)
+      scroll buttons found in Tux Paint.
+      (SourceForge Bug #2918289)
+
     * Slightly improved mouse motion handling when Tux Paint is very busy
       drawing or previewing.  (e.g., when drawing a circle, you could often
       end up with a "D" shape... now, you get more of a regular polygon shape
diff --git a/src/tuxpaint.c b/src/tuxpaint.c
index 4ae318220..dc624003a 100644
--- a/src/tuxpaint.c
+++ b/src/tuxpaint.c
@@ -22,7 +22,7 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   (See COPYING.txt)
   
-  June 14, 2002 - April 26, 2011
+  June 14, 2002 - April 27, 2011
 */
 
 
@@ -1212,6 +1212,7 @@ static int have_to_rec_label_node_back;
 static SDL_Surface *img_title, *img_title_credits, *img_title_tuxpaint;
 static SDL_Surface *img_btn_up, *img_btn_down, *img_btn_off;
 static SDL_Surface *img_btnsm_up, *img_btnsm_off, *img_btnsm_down;
+static SDL_Surface *img_btn_nav;
 static SDL_Surface *img_prev, *img_next;
 static SDL_Surface *img_mirror, *img_flip;
 static SDL_Surface *img_dead40x40;
@@ -8713,7 +8714,7 @@ static void draw_stamps(void)
   /* Show prev button: */
   
   button_color = img_black;
-  button_body = img_btn_up;
+  button_body = img_btn_nav;
 
   dest.x = WINDOW_WIDTH - 96;
   dest.y = 40 + (((most + TOOLOFFSET) / 2) * 48);
@@ -8729,7 +8730,7 @@ static void draw_stamps(void)
   /* Show next button: */
 
   button_color = img_black;
-  button_body = img_btn_up;
+  button_body = img_btn_nav;
   
   dest.x = WINDOW_WIDTH - 48;
   dest.y = 40 + (((most + TOOLOFFSET) / 2) * 48);
@@ -12137,6 +12138,8 @@ static void cleanup(void)
   free_surface(&img_btnsm_off);
   free_surface(&img_btnsm_down);
 
+  free_surface(&img_btn_nav);
+
   free_surface(&img_sfx);
   free_surface(&img_speak);
 
@@ -22157,6 +22160,8 @@ static void setup(void)
   img_btnsm_off = loadimage(DATA_PREFIX "images/ui/btnsm_off.png");
   img_btnsm_down = loadimage(DATA_PREFIX "images/ui/btnsm_down.png");
 
+  img_btn_nav = loadimage(DATA_PREFIX "images/ui/btn_nav.png");
+
   img_sfx = loadimage(DATA_PREFIX "images/tools/sfx.png");
   img_speak = loadimage(DATA_PREFIX "images/tools/speak.png");