(svn r16367) -Codechange: Do not use min_x and min_y for storing smallest size to allow initialization more than once.

1 files changed, 7 insertions, 2 deletions

diff --git a/src/widget_type.h b/src/widget_type.h
index af15e2bef..53a887e45 100644
--- a/src/widget_type.h
+++ b/src/widget_type.h
@@ -173,12 +173,17 @@ public:
 	};
 
 	WidgetType type;      ///< Type of the widget / nested widget.
-	uint min_x;           ///< Minimal horizontal size.
-	uint min_y;           ///< Minimal vertical size.
+	uint min_x;           ///< Minimal horizontal size of only this widget.
+	uint min_y;           ///< Minimal vertical size of only this widget.
 	bool fill_x;          ///< Allow horizontal filling from initial size.
 	bool fill_y;          ///< Allow vertical filling from initial size.
 	uint resize_x;        ///< Horizontal resize step (\c 0 means not resizable).
 	uint resize_y;        ///< Vertical resize step (\c 0 means not resizable).
+	/* Size of the widget in the smallest window possible.
+	 * Computed by #ComputeMinimalSize() followed by #AssignMinimalPosition().
+	 */
+	uint smallest_x;      ///< Smallest horizontal size of the widget in a filled window.
+	uint smallest_y;      ///< Smallest vertical size of the widget in a filled window.
 
 	uint pos_x;           ///< Horizontal position of top-left corner of the widget in the window.
 	uint pos_y;           ///< Vertical position of top-left corner of the widget in the window.