X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flayout.h;h=cbd763e9e5337dc7a6395d7d0b3a860c6d9ad7e1;hb=fdc7fecc65f5f517d66abe3546a949a46836c4a6;hp=7d53470624cf7c7d925ef247fd7f96692babc175;hpb=6549eff66171d53be91ea7ba3f23339812ef6cad;p=libs%2Fgltk.git

diff --git a/source/layout.h b/source/layout.h
index 7d53470..cbd763e 100644
--- a/source/layout.h
+++ b/source/layout.h
@@ -101,6 +101,7 @@ protected:
 		Layout &layout;
 		unsigned index;
 		Widget &widget;
+		Geometry autosize_geom;
 		Geometry geom;
 		std::list<Constraint> constraints;
 		Packing horiz_pack;
@@ -112,6 +113,12 @@ protected:
 		void autosize_changed();
 	};
 
+	enum SolveMode
+	{
+		UPDATE,
+		AUTOSIZE
+	};
+
 	class LinearProgram;
 	struct Pointers;
 
@@ -120,6 +127,7 @@ protected:
 	Sides margin;
 	unsigned row_spacing;
 	unsigned col_spacing;
+	Geometry autosize_geom;
 
 	static Pointers pointers[2];
 
@@ -145,11 +153,10 @@ public:
 	void set_expand(Widget &, bool, bool);
 
 	void update();
+	void autosize();
 
 protected:
-	void find_constraint_group(Slot &, ConstraintType, std::set<Slot *> &);
-	void sort_slots(std::list<Slot *> &, ConstraintType);
-	void solve_constraints(int);
+	void solve_constraints(int, SolveMode);
 };
 
 } // namespace GLtk