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

diff --git a/source/layout.h b/source/layout.h
index 7d53470..2303651 100644
--- a/source/layout.h
+++ b/source/layout.h
@@ -84,6 +84,7 @@ protected:
 	{
 		ConstraintType type;
 		Slot ⌖
+		int spacing;
 
 		Constraint(ConstraintType, Slot &);
 	};
@@ -101,6 +102,7 @@ protected:
 		Layout &layout;
 		unsigned index;
 		Widget &widget;
+		Geometry autosize_geom;
 		Geometry geom;
 		std::list<Constraint> constraints;
 		Packing horiz_pack;
@@ -112,6 +114,12 @@ protected:
 		void autosize_changed();
 	};
 
+	enum SolveMode
+	{
+		UPDATE,
+		AUTOSIZE
+	};
+
 	class LinearProgram;
 	struct Pointers;
 
@@ -120,6 +128,7 @@ protected:
 	Sides margin;
 	unsigned row_spacing;
 	unsigned col_spacing;
+	Geometry autosize_geom;
 
 	static Pointers pointers[2];
 
@@ -139,17 +148,24 @@ protected:
 	virtual Slot *create_slot(Widget &);
 	Slot &get_slot_for_widget(Widget &);
 	static ConstraintType complement(ConstraintType);
+	void create_constraint(Widget &, ConstraintType, Widget &, int);
+
 public:
-	void add_constraint(Widget &, ConstraintType, Widget &);
+	/** Adds a constraint between two widgets. */
+	void add_constraint(Widget &src, ConstraintType type, Widget &tgt);
+
+	/** Adds a constraint between two widgets, overriding the default spacing.
+	Not all constraint types use a spacing. */
+	void add_constraint(Widget &src, ConstraintType type, Widget &tgt, unsigned);
+
 	void set_gravity(Widget &, int, int);
 	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