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

[Philippe Plantier]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Philippe Plantier <address@hidden>      05/08/21 19:07:08

Modified files:
        src            : intro.cpp 

Log message:
        Fixed #13961 : now, the campaign text + buttons are always at least 
400px wide,
        even if the image is smaller.

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

Patches:
Index: wesnoth/src/intro.cpp
diff -u wesnoth/src/intro.cpp:1.81 wesnoth/src/intro.cpp:1.82
--- wesnoth/src/intro.cpp:1.81  Sat Jul 23 18:07:09 2005
+++ wesnoth/src/intro.cpp       Sun Aug 21 19:07:08 2005
@@ -1,4 +1,4 @@
-/* $Id: intro.cpp,v 1.81 2005/07/23 18:07:09 gruikya Exp $ */
+/* $Id: intro.cpp,v 1.82 2005/08/21 19:07:08 gruikya Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -127,8 +127,15 @@
                textx = 10;
                int xbuttons = video.getx() - 50;
 #else
-               textx = dstrect.x;
-               int xbuttons = dstrect.x+dstrect.w-40;
+               int xbuttons;
+
+               if (background->w > 400) {
+                       textx = dstrect.x;
+                       xbuttons = dstrect.x+dstrect.w-40;
+               } else {
+                       textx = 200;
+                       xbuttons = video.getx() - 200 - 40;
+               }
 #endif
                texty = dstrect.y + dstrect.h + 10;