[Wesnoth-cvs-commits] wesnoth/src preferences.cpp

[Jon Daniel]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Jon Daniel <address@hidden>     05/08/01 07:47:08

Modified files:
        src            : preferences.cpp 

Log message:
        use the correct slider_label_width for the volume sliders

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/preferences.cpp.diff?tr1=1.167&tr2=1.168&r1=text&r2=text

Patches:
Index: wesnoth/src/preferences.cpp
diff -u wesnoth/src/preferences.cpp:1.167 wesnoth/src/preferences.cpp:1.168
--- wesnoth/src/preferences.cpp:1.167   Sun Jul 31 21:06:22 2005
+++ wesnoth/src/preferences.cpp Mon Aug  1 07:47:07 2005
@@ -1,4 +1,4 @@
-/* $Id: preferences.cpp,v 1.167 2005/07/31 21:06:22 j_daniel Exp $ */
+/* $Id: preferences.cpp,v 1.168 2005/08/01 07:47:07 j_daniel Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -1030,10 +1030,11 @@
        ypos = rect.y;
        sound_button_.set_location(rect.x, ypos);
 
+       const unsigned slider_label_width = 
maximum<unsigned>(sound_label_.width(), music_label_.width());
        ypos += item_interline;
        sound_label_.set_location(rect.x, ypos);
-       const SDL_Rect sound_rect = { rect.x + slider_label_width_, ypos,
-                               rect.w - slider_label_width_ - border, 0 };
+       const SDL_Rect sound_rect = { rect.x + slider_label_width, ypos,
+                               rect.w - slider_label_width - border, 0 };
        sound_slider_.set_location(sound_rect);
 
        ypos += item_interline;
@@ -1041,8 +1042,8 @@
 
        ypos += item_interline;
        music_label_.set_location(rect.x, ypos);
-       const SDL_Rect music_rect = { rect.x + slider_label_width_, ypos,
-                               rect.w - slider_label_width_ - border, 0 };
+       const SDL_Rect music_rect = { rect.x + slider_label_width, ypos,
+                               rect.w - slider_label_width - border, 0 };
        music_slider_.set_location(music_rect);
 
        //Advanced tab