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

diff --git a/source/layout.h b/source/layout.h
index 2de4013..c9263d3 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 &);
 
@@ -151,7 +188,7 @@ public:
 	void set_container(Container &);
 	void set_margin(const Sides &);
 
-	/** 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
@@ -185,8 +222,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);