X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flayout.h;h=141a15cdb317d7920fd394778312f28002228b24;hb=deebbb5d23f7bdad0e25fe7eeb0a3e5a4eaf761f;hp=a8ea3bf25b7f819492d14eb34c30a24380ba1f76;hpb=72db2a8d41cc0eb8404572d1a720d59fab0551cd;p=libs%2Fgltk.git

diff --git a/source/layout.h b/source/layout.h
index a8ea3bf..141a15c 100644
--- a/source/layout.h
+++ b/source/layout.h
@@ -153,6 +153,7 @@ private:
 		Packing horiz_pack;
 		Packing vert_pack;
 		bool ghost;
+		bool floating;
 
 		Slot(Layout &, Widget &);
 
@@ -172,7 +173,7 @@ private:
 	Container *container;
 	std::list<Slot *> slots;
 	unsigned n_active_slots;
-	unsigned n_slack_constraints[2];
+	unsigned n_slack_vars[2];
 	Sides margin;
 	unsigned row_spacing;
 	unsigned col_spacing;
@@ -187,8 +188,9 @@ public:
 
 	void set_container(Container &);
 	void set_margin(const Sides &);
+	const Sides &get_margin() const { return margin; }
 
-	/** Sets the default spacing between widgets in bothg directions. */
+	/** Sets the default spacing between widgets in both directions. */
 	void set_spacing(unsigned);
 
 	/** Sets the default vertical spacing between widgets.  Affects the ABOVE
@@ -199,6 +201,9 @@ public:
 	LEFT_OF and RIGHT_OF constraints. */
 	void set_column_spacing(unsigned);
 
+	unsigned get_row_spacing() const { return row_spacing; }
+	unsigned get_column_spacing() const { return col_spacing; }
+
 	void push_arrangement(Arrangement &);
 	Arrangement *get_arrangement() const;
 	void pop_arrangement(Arrangement &);
@@ -225,8 +230,10 @@ public:
 	/// Sets a widget as a ghost, taking up space even if it is hidden.
 	void set_ghost(Widget &, bool);
 
+	void set_floating(Widget &, bool);
+
 	void update();
-	void autosize();
+	void autosize(Geometry &);
 
 private:
 	void solve_constraints(int, SolveMode);