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

[David White]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     David White <address@hidden>    05/06/04 03:39:22

Modified files:
        src            : multiplayer_ui.cpp 
        src/widgets    : menu.cpp 

Log message:
        adjusted position of 'users' menu in multiplayer lobby so it is 
positioned nicely, and extends all the way down the screen

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_ui.cpp.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/menu.cpp.diff?tr1=1.93&tr2=1.94&r1=text&r2=text

Patches:
Index: wesnoth/src/multiplayer_ui.cpp
diff -u wesnoth/src/multiplayer_ui.cpp:1.25 wesnoth/src/multiplayer_ui.cpp:1.26
--- wesnoth/src/multiplayer_ui.cpp:1.25 Fri Jun  3 19:15:28 2005
+++ wesnoth/src/multiplayer_ui.cpp      Sat Jun  4 03:39:21 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_ui.cpp,v 1.25 2005/06/03 19:15:28 j_daniel Exp $ */
+/* $Id: multiplayer_ui.cpp,v 1.26 2005/06/04 03:39:21 Sirp Exp $ */
 /*
    Copyright (C) 2005 
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -348,8 +348,10 @@
 
 void ui::layout_children(const SDL_Rect& rect)
 {
-       users_menu_.set_width(xscale(156));
-       users_menu_.set_location(xscale(856), yscale(42));
+       users_menu_.set_width(xscale(159));
+       users_menu_.set_location(xscale(856), yscale(42));
+       users_menu_.set_height(yscale(715));
+       users_menu_.set_max_height(yscale(715));
        chat_textbox_.set_location(xscale(11) + 4, yscale(573) + 4);
        chat_textbox_.set_measurements(xscale(833) - 8, yscale(143) - 8);
        entry_textbox_.set_location(xscale(11) + 4, yscale(732));
Index: wesnoth/src/widgets/menu.cpp
diff -u wesnoth/src/widgets/menu.cpp:1.93 wesnoth/src/widgets/menu.cpp:1.94
--- wesnoth/src/widgets/menu.cpp:1.93   Thu May 19 18:52:59 2005
+++ wesnoth/src/widgets/menu.cpp        Sat Jun  4 03:39:22 2005
@@ -394,7 +394,9 @@
 }
 
 void menu::set_max_height(const int new_max_height) {
-       max_height_ = new_max_height;
+       max_height_ = new_max_height;
+       itemRects_.clear();
+       max_items_ = -1;
 }
 
 void menu::set_max_width(const int new_max_width) {