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

diff --git a/source/layout.h b/source/layout.h
index 379b468..0ea47a1 100644
--- a/source/layout.h
+++ b/source/layout.h
@@ -20,11 +20,11 @@ is then solved to obtain positions and dimensions that fulfill the constraints.
 There are three kinds of constraints available: ordering, alignment and
 dimension matching.
 
-Ordering constraints specify that the widgets should be placed next to other
-along X or Y axis.  These operate on one axis at a time, so a widget could be
-"right of" another even if they are separated by hundreds of pixels vertically.
-The widgets will be separated by a spacing value, which is settable on a per-
-layout basis.
+Ordering constraints specify that the widgets should be placed next to each
+other along X or Y axis.  These operate on one axis at a time, so a widget
+could be "right of" another even if they are separated by hundreds of pixels
+vertically.  The widgets will be separated by a spacing value, which is
+settable on a per-layout basis.
 
 Alignment constraints make the corresponding edges of two widgets be on the
 same line.  These are incompatible with ordering constraints, so only one or
@@ -45,8 +45,8 @@ dependent widgets have the expand flag set, the results are currently
 undefined.
 
 Since specifiyng constraints manually can be quite tedious, there are some
-derived Layout classes that implement common positioning patterns.  See
-MixedRows and Grid.
+derived Layout classes that implement common positioning patterns.  See Row,
+Column, MixedRows and Grid.
 */
 class Layout
 {
@@ -84,6 +84,7 @@ protected:
 	{
 		ConstraintType type;
 		Slot ⌖
+		int spacing;
 
 		Constraint(ConstraintType, Slot &);
 	};
@@ -99,8 +100,9 @@ protected:
 	struct Slot: public sigc::trackable
 	{
 		Layout &layout;
-		unsigned index;
+		int index;
 		Widget &widget;
+		Geometry autosize_geom;
 		Geometry geom;
 		std::list<Constraint> constraints;
 		Packing horiz_pack;
@@ -110,6 +112,13 @@ protected:
 		virtual ~Slot() { }
 
 		void autosize_changed();
+		void visibility_changed(bool);
+	};
+
+	enum SolveMode
+	{
+		UPDATE,
+		AUTOSIZE
 	};
 
 	class LinearProgram;
@@ -117,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];
 
@@ -129,27 +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 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