X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flayout.h;h=043d92cc1554b738092ce3ad771fcf5bb3cc5049;hb=813a0fc10cf5f7aaa6356cd97a4258fa78b9b87f;hp=2de4013a5d1e8b943cf939abd5b63b114e5fd1e3;hpb=b30edd979e6e9c7acfaaf3a90903814a7e62a71e;p=libs%2Fgltk.git

diff --git a/source/layout.h b/source/layout.h
index 2de4013..043d92c 100644
--- a/source/layout.h
+++ b/source/layout.h
@@ -86,7 +86,43 @@ public:
 		COPY_HEIGHT = VERTICAL|SELF_DIM|TARGET_DIM
 	};
 
+	class Loader: public DataFile::ObjectLoader<Layout>
+	{
+	public:
+		typedef std::map<std::string, Widget *> WidgetMap;
+
+	private:
+		const WidgetMap &wdg_map;
+
+	public:
+		Loader(Layout &, const WidgetMap &);
+
+	private:
+		void column_spacing(unsigned);
+		void margin();
+		void row_spacing(unsigned);
+		void spacing(unsigned);
+		void widget(const std::string &);
+	};
+
 private:
+	class WidgetLoader: public DataFile::Loader
+	{
+	private:
+		Layout &layout;
+		Widget &widget;
+		const Layout::Loader::WidgetMap &wdg_map;
+
+	public:
+		WidgetLoader(Layout &, Widget &, const Layout::Loader::WidgetMap &);
+
+	private:
+		void constraint(ConstraintType, const std::string &);
+		void expand(bool, bool);
+		void ghost(bool);
+		void gravity(int, int);
+	};
+
 	struct Slot;
 
 	struct Constraint
@@ -116,6 +152,7 @@ private:
 		std::list<Constraint> constraints;
 		Packing horiz_pack;
 		Packing vert_pack;
+		bool ghost;
 
 		Slot(Layout &, Widget &);
 
@@ -135,7 +172,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;
@@ -150,8 +187,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
@@ -162,6 +200,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 &);
@@ -185,8 +226,11 @@ public:
 	void set_gravity(Widget &, int, int);
 	void set_expand(Widget &, bool, bool);
 
+	/// Sets a widget as a ghost, taking up space even if it is hidden.
+	void set_ghost(Widget &, bool);
+
 	void update();
-	void autosize();
+	void autosize(Geometry &);
 
 private:
 	void solve_constraints(int, SolveMode);