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

[Guillaume Melquiond]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Guillaume Melquiond <address@hidden>    05/01/20 23:03:25

Modified files:
        src            : titlescreen.cpp 

Log message:
        Fix the dialog frame being drawn after the buttons, and hence not being 
registered as a background, causing bug #11605. Since I'm at it, ensure that 
all the buttons have the same width.

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

Patches:
Index: wesnoth/src/titlescreen.cpp
diff -u wesnoth/src/titlescreen.cpp:1.31 wesnoth/src/titlescreen.cpp:1.32
--- wesnoth/src/titlescreen.cpp:1.31    Sat Nov 27 10:24:50 2004
+++ wesnoth/src/titlescreen.cpp Thu Jan 20 23:03:25 2005
@@ -212,9 +212,7 @@
        size_t b, max_width = 0;
        for(b = 0; b != nbuttons; ++b) {
                buttons.push_back(button(screen,sgettext(button_labels[b])));
-               buttons.back().set_location(menu_xbase + b*menu_xincr, 
menu_ybase + b*menu_yincr);
                buttons.back().set_help_string(sgettext(help_button_labels[b]));
-               LOG_DP << "set help string for '" << button_labels[b] << "' -> 
'" << sgettext(help_button_labels[b]) << "'\n";
                max_width = maximum<size_t>(max_width,buttons.back().width());
        }
 
@@ -222,6 +220,11 @@
        std::string style = "mainmenu";
        
draw_dialog_frame(main_dialog_area.x,main_dialog_area.y,main_dialog_area.w,main_dialog_area.h,screen,&style);
 
+       for(b = 0; b != nbuttons; ++b) {
+               buttons[b].set_width(max_width);
+               buttons[b].set_location(menu_xbase + b*menu_xincr, menu_ybase + 
b*menu_yincr);
+       }
+
        gui::button 
next_tip_button(screen,_("More"),button::TYPE_PRESS,"lite_small");
 
        if(tips_of_day.empty()) {