X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flayout.h;h=a13a0934a5761a962ca4eddd553d48c76476872f;hb=05ef650bff69b998440a6c082dd90e205fe6c233;hp=9c4e2a07e6525b73e15783c0df17d397f739ad1d;hpb=5dfee9d7239278cbedae484604056aa03f84cd40;p=libs%2Fgltk.git

diff --git a/source/layout.h b/source/layout.h
index 9c4e2a0..a13a093 100644
--- a/source/layout.h
+++ b/source/layout.h
@@ -63,8 +63,9 @@ private:
 		TARGET_POS = 8,
 		TARGET_DIM = 16,
 		TARGET_MASK = 24,
-		SPACING = 32,
-		SLACK = 64
+		HALF_DIM = 32,
+		SPACING = 64,
+		SLACK = 128
 	};
 
 public:
@@ -79,8 +80,10 @@ public:
 		FAR_RIGHT_OF = HORIZONTAL|SELF_POS|TARGET_POS|TARGET_DIM|SPACING|SLACK,
 		FAR_LEFT_OF = HORIZONTAL|SELF_POS|SELF_DIM|TARGET_POS|SPACING|SLACK,
 		ALIGN_TOP = VERTICAL|SELF_POS|SELF_DIM|TARGET_POS|TARGET_DIM,
+		ALIGN_VCENTER = VERTICAL|SELF_POS|SELF_DIM|TARGET_POS|TARGET_DIM|HALF_DIM,
 		ALIGN_BOTTOM = VERTICAL|SELF_POS|TARGET_POS,
 		ALIGN_RIGHT = HORIZONTAL|SELF_POS|SELF_DIM|TARGET_POS|TARGET_DIM,
+		ALIGN_HCENTER = HORIZONTAL|SELF_POS|SELF_DIM|TARGET_POS|TARGET_DIM|HALF_DIM,
 		ALIGN_LEFT = HORIZONTAL|SELF_POS|TARGET_POS,
 		COPY_WIDTH = HORIZONTAL|SELF_DIM|TARGET_DIM,
 		COPY_HEIGHT = VERTICAL|SELF_DIM|TARGET_DIM
@@ -153,6 +156,7 @@ private:
 		Packing horiz_pack;
 		Packing vert_pack;
 		bool ghost;
+		bool floating;
 
 		Slot(Layout &, Widget &);
 
@@ -172,7 +176,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;
@@ -229,6 +233,8 @@ public:
 	/// Sets a widget as a ghost, taking up space even if it is hidden.
 	void set_ghost(Widget &, bool);
 
+	void set_floating(Widget &, bool);
+
 	void update();
 	void autosize(Geometry &);