Author: mordante
Date: Thu Apr 30 14:14:45 2009
New Revision: 35341
URL: http://svn.gna.org/viewcvs/wesnoth?rev=35341&view=rev
Log:
Forward all layout functions to the grid.
The container does nothing regarding resizing so forward everything.
Modified:
trunk/src/gui/widgets/container.cpp
trunk/src/gui/widgets/container.hpp
Modified: trunk/src/gui/widgets/container.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/container.cpp?rev=35341&r1=35340&r2=35341&view=diff
==============================================================================
--- trunk/src/gui/widgets/container.cpp (original)
+++ trunk/src/gui/widgets/container.cpp Thu Apr 30 14:14:45 2009
@@ -49,9 +49,29 @@
grid_.NEW_reduce_width(maximum_width - border_space().x);
}
+void tcontainer_::NEW_request_reduce_width(const unsigned maximum_width)
+{
+ grid_.NEW_request_reduce_width(maximum_width - border_space().x);
+}
+
+void tcontainer_::NEW_demand_reduce_width(const unsigned maximum_width)
+{
+ grid_.NEW_demand_reduce_width(maximum_width - border_space().x);
+}
+
void tcontainer_::NEW_reduce_height(const unsigned maximum_height)
{
grid_.NEW_reduce_height(maximum_height - border_space().y);
+}
+
+void tcontainer_::NEW_request_reduce_height(const unsigned maximum_height)
+{
+ grid_.NEW_request_reduce_height(maximum_height - border_space().y);
+}
+
+void tcontainer_::NEW_demand_reduce_height(const unsigned maximum_height)
+{
+ grid_.NEW_demand_reduce_height(maximum_height - border_space().y);
}
void tcontainer_::layout_wrap(const unsigned maximum_width)
Modified: trunk/src/gui/widgets/container.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/container.hpp?rev=35341&r1=35340&r2=35341&view=diff
==============================================================================
--- trunk/src/gui/widgets/container.hpp (original)
+++ trunk/src/gui/widgets/container.hpp Thu Apr 30 14:14:45 2009
@@ -61,6 +61,12 @@
*/
void NEW_reduce_width(const unsigned maximum_width);
+ /** Inherited from tcontrol. */
+ void NEW_request_reduce_width(const unsigned maximum_width);
+
+ /** Inherited from twidget. */
+ void NEW_demand_reduce_width(const unsigned maximum_width);
+
/**
* Tries to reduce the height of a container.
*
@@ -69,6 +75,12 @@
* @param maximum_height The wanted maximum height.
*/
void NEW_reduce_height(const unsigned maximum_height);
+
+ /** Inherited from twidget. */
+ void NEW_request_reduce_height(const unsigned maximum_height);
+
+ /** Inherited from twidget. */
+ void NEW_demand_reduce_height(const unsigned maximum_height);
private:
/** Inherited from twidget. */
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
