[Wesnoth-cvs-commits] wesnoth/src multiplayer_wait.cpp widgets/menu.c...

[Philippe Plantier]

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

Modified files:
        src            : multiplayer_wait.cpp 
        src/widgets    : menu.cpp menu.hpp textbox.cpp 

Log message:
        Fixed the second part of bug #14124

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_wait.cpp.diff?tr1=1.33&tr2=1.34&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/menu.cpp.diff?tr1=1.99&tr2=1.100&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/menu.hpp.diff?tr1=1.41&tr2=1.42&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/textbox.cpp.diff?tr1=1.84&tr2=1.85&r1=text&r2=text

Patches:
Index: wesnoth/src/multiplayer_wait.cpp
diff -u wesnoth/src/multiplayer_wait.cpp:1.33 
wesnoth/src/multiplayer_wait.cpp:1.34
--- wesnoth/src/multiplayer_wait.cpp:1.33       Sun Aug 21 14:46:04 2005
+++ wesnoth/src/multiplayer_wait.cpp    Sun Aug 21 15:24:36 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_wait.cpp,v 1.33 2005/08/21 14:46:04 gruikya Exp $ */
+/* $Id: multiplayer_wait.cpp,v 1.34 2005/08/21 15:24:36 gruikya Exp $ */
 /*
    Copyright (C)
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -280,6 +280,7 @@
        game_menu_.set_location(ca.x, ca.y + title().height());
        game_menu_.set_measurements(ca.w, y - ca.y - title().height()
                        - gui::ButtonVPadding);
+       game_menu_.set_max_height(y - ca.y - title().height() - 
gui::ButtonVPadding);
        cancel_button_.set_location(ca.x + ca.w - cancel_button_.width(), y);
        start_label_.set_location(ca.x, y + 4);
 }
Index: wesnoth/src/widgets/menu.cpp
diff -u wesnoth/src/widgets/menu.cpp:1.99 wesnoth/src/widgets/menu.cpp:1.100
--- wesnoth/src/widgets/menu.cpp:1.99   Sun Aug 21 14:16:30 2005
+++ wesnoth/src/widgets/menu.cpp        Sun Aug 21 15:24:36 2005
@@ -1,4 +1,4 @@
-/* $Id: menu.cpp,v 1.99 2005/08/21 14:16:30 gruikya Exp $ */
+/* $Id: menu.cpp,v 1.100 2005/08/21 15:24:36 gruikya Exp $ */
 /*
    Copyright (C) 2003-5 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -406,14 +406,16 @@
        set_dirty();
 }
 
-void menu::set_max_height(const int new_max_height) {
+void menu::set_max_height(const int new_max_height) 
+{
        max_height_ = new_max_height;
        itemRects_.clear();
        max_items_ = -1;
        update_size();
 }
 
-void menu::set_max_width(const int new_max_width) {
+void menu::set_max_width(const int new_max_width) 
+{
        max_width_ = new_max_width;
 }
 
Index: wesnoth/src/widgets/menu.hpp
diff -u wesnoth/src/widgets/menu.hpp:1.41 wesnoth/src/widgets/menu.hpp:1.42
--- wesnoth/src/widgets/menu.hpp:1.41   Sun Aug 21 14:16:30 2005
+++ wesnoth/src/widgets/menu.hpp        Sun Aug 21 15:24:37 2005
@@ -1,4 +1,4 @@
-/* $Id: menu.hpp,v 1.41 2005/08/21 14:16:30 gruikya Exp $ */
+/* $Id: menu.hpp,v 1.42 2005/08/21 15:24:37 gruikya Exp $ */
 /*
    Copyright (C) 2003-5 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org/
Index: wesnoth/src/widgets/textbox.cpp
diff -u wesnoth/src/widgets/textbox.cpp:1.84 
wesnoth/src/widgets/textbox.cpp:1.85
--- wesnoth/src/widgets/textbox.cpp:1.84        Sun Aug 21 12:58:46 2005
+++ wesnoth/src/widgets/textbox.cpp     Sun Aug 21 15:24:37 2005
@@ -1,4 +1,4 @@
-/* $Id: textbox.cpp,v 1.84 2005/08/21 12:58:46 gruikya Exp $ */
+/* $Id: textbox.cpp,v 1.85 2005/08/21 15:24:37 gruikya Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org/