X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flayout.h;h=0ea47a11c3bdbcef50821bf619ed361b09d48ad5;hb=50f11cec86c034fbee2ab332503266808b1eba74;hp=cf63538413e6465c967f93063ee394e8fc09f07d;hpb=99595e939b7f5753773f36a0a8298cd837924030;p=libs%2Fgltk.git

diff --git a/source/layout.h b/source/layout.h
index cf63538..0ea47a1 100644
--- a/source/layout.h
+++ b/source/layout.h
@@ -84,6 +84,7 @@ protected:
 	{
 		ConstraintType type;
 		Slot ⌖
+		int spacing;
 
 		Constraint(ConstraintType, Slot &);
 	};
@@ -99,7 +100,7 @@ protected:
 	struct Slot: public sigc::trackable
 	{
 		Layout &layout;
-		unsigned index;
+		int index;
 		Widget &widget;
 		Geometry autosize_geom;
 		Geometry geom;
@@ -111,6 +112,13 @@ protected:
 		virtual ~Slot() { }
 
 		void autosize_changed();
+		void visibility_changed(bool);
+	};
+
+	enum SolveMode
+	{
+		UPDATE,
+		AUTOSIZE
 	};
 
 	class LinearProgram;
@@ -118,9 +126,11 @@ protected:
 
 	Container *container;
 	std::list<Slot *> slots;
+	unsigned n_active_slots;
 	Sides margin;
 	unsigned row_spacing;
 	unsigned col_spacing;
+	Geometry autosize_geom;
 
 	static Pointers pointers[2];
 
@@ -130,25 +140,43 @@ public:
 
 	void set_container(Container &);
 	void set_margin(const Sides &);
+
+	/** Sets the default spacing between widgets in bothg directions. */
 	void set_spacing(unsigned);
+
+	/** Sets the default vertical spacing between widgets.  Affects the ABOVE
+	and BELOW constraints. */
 	void set_row_spacing(unsigned);
+
+	/** Sets the default horizontal spacing between widgets.  Affects the
+	LEFT_OF and RIGHT_OF constraints. */
 	void set_column_spacing(unsigned);
 
 	void add_widget(Widget &);
 	void remove_widget(Widget &);
 protected:
 	virtual Slot *create_slot(Widget &);
+	void update_slot_indices();
 	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 solve_constraints(int);
+	void solve_constraints(int, SolveMode);
 };
 
 } // namespace GLtk