Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwkendrick <wkendrick>2011-04-27 20:38:24 (GMT)
committer wkendrick <wkendrick>2011-04-27 20:38:24 (GMT)
commit941d6fa92222767d8997960511ecbd1c58dbd109 (patch)
tree4d2fbdf6d3526920979cc9cd1331780b19265765
parent27be90f9ee82a8c23abe4d7df9ab10ba1f2fd0d1 (diff)
Left/Right Stamp navigation buttons are purple, like the other (up/down) scroll buttons found in Tux Paint. (SourceForge Bug #2918289)
-rw-r--r--data/images/ui/btn_nav.pngbin0 -> 2492 bytes
-rw-r--r--docs/CHANGES.txt8
-rw-r--r--src/tuxpaint.c11
3 files changed, 14 insertions, 5 deletions
diff --git a/data/images/ui/btn_nav.png b/data/images/ui/btn_nav.png
new file mode 100644
index 0000000..684a335
--- /dev/null
+++ b/data/images/ui/btn_nav.png
Binary files differ
diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index 331e91b..47eff14 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -6,9 +6,9 @@ Copyright (c) 2002-2011 by Bill Kendrick and others
bill@newbreedsoftware.com
http://www.tuxpaint.org/
-$Id: CHANGES.txt,v 1.773 2011/04/26 19:14:17 wkendrick Exp $
+$Id: CHANGES.txt,v 1.774 2011/04/27 20:38:24 wkendrick Exp $
-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: CHANGES.txt,v 1.773 2011/04/26 19:14:17 wkendrick Exp $
-------------------
* 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 4ae3182..dc62400 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");