Author: mordante
Date: Sat Jul 12 20:07:15 2008
New Revision: 27941
URL: http://svn.gna.org/viewcvs/wesnoth?rev=27941&view=rev
Log:
Fix the other bug unvealed by r27911. The size of the widget isn't honoured
which
causes the widget to use the best_size which might not fit in the dialog.
Loonycyborg spotted the bug in the language dialog.
Modified:
trunk/src/gui/widgets/grid.cpp
Modified: trunk/src/gui/widgets/grid.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/grid.cpp?rev=27941&r1=27940&r2=27941&view=diff
==============================================================================
--- trunk/src/gui/widgets/grid.cpp (original)
+++ trunk/src/gui/widgets/grid.cpp Sat Jul 12 20:07:15 2008
@@ -611,7 +611,9 @@
}
}
- tpoint widget_size = best_size;
+ tpoint widget_size = tpoint(
+ std::min(size.x, best_size.x),
+ std::min(size.y, best_size.y));
tpoint widget_orig = orig;
if(flags_ & VERTICAL_GROW_SEND_TO_CLIENT) {
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
