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

[Guillaume Melquiond]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Guillaume Melquiond <address@hidden>    05/04/09 17:46:32

Modified files:
        src            : titlescreen.cpp 

Log message:
        Fix bug #12534: the frame is drawn after the button has been drawn (and 
hence is corrupted once the button is refreshed).

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

Patches:
Index: wesnoth/src/titlescreen.cpp
diff -u wesnoth/src/titlescreen.cpp:1.40 wesnoth/src/titlescreen.cpp:1.41
--- wesnoth/src/titlescreen.cpp:1.40    Sat Mar 26 17:10:32 2005
+++ wesnoth/src/titlescreen.cpp Sat Apr  9 17:46:31 2005
@@ -253,11 +253,13 @@
                area.x = main_dialog_area.x - 
(game_config::title_tip_x*screen.x())/1024 - area.w;
                area.y = main_dialog_area.y + main_dialog_area.h - area.h;
 
-               
next_tip_button.set_location(area.x+area.w-next_tip_button.location().w - 
pad,area.y+area.h - pad - next_tip_button.location().h);
-
                
draw_dialog_frame(area.x,area.y,area.w,area.h,screen.video(),&style);
 
-               
font::draw_text(&screen.video(),area,font::SIZE_NORMAL,font::NORMAL_COLOUR,tip_of_day,area.x+pad,area.y+pad);
+               next_tip_button.set_location(area.x + area.w - 
next_tip_button.location().w - pad,
+                                            area.y + area.h - pad - 
next_tip_button.location().h);
+
+               font::draw_text(&screen.video(), area, font::SIZE_NORMAL, 
font::NORMAL_COLOUR,
+                               tip_of_day, area.x + pad, area.y + pad);
                font::draw_text(&screen.video(), area, font::SIZE_NORMAL, 
font::NORMAL_COLOUR,
                                tome, area.x + area.w - tome_area.w - pad,
                                next_tip_button.location().y - tome_area.h - 
pad, false, TTF_STYLE_ITALIC);