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

diff --git a/source/layout.h b/source/layout.h
index 9c4e2a0..274660c 100644
--- a/source/layout.h
+++ b/source/layout.h
@@ -1,11 +1,12 @@
 #ifndef MSP_GLTK_LAYOUT_H_
 #define MSP_GLTK_LAYOUT_H_
 
-#include <list>
-#include <set>
+#include <memory>
+#include <vector>
 #include <sigc++/trackable.h>
 #include <msp/strings/lexicalcast.h>
 #include "geometry.h"
+#include "mspgltk_api.h"
 
 namespace Msp {
 namespace GLtk {
@@ -50,7 +51,7 @@ Since specifiyng constraints manually can be quite tedious, an Arrangement
 interface is provided to automatically arrange widgets.  See classes Row,
 Column and Grid for some commonly used arrangements.
 */
-class Layout
+class MSPGLTK_API Layout
 {
 private:
 	enum
@@ -63,8 +64,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 +81,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
@@ -128,31 +132,30 @@ private:
 	struct Constraint
 	{
 		ConstraintType type;
-		Slot &target;
-		int spacing;
+		Slot *target = nullptr;
+		int spacing = -1;
 
 		Constraint(ConstraintType, Slot &);
 	};
 
 	struct Packing
 	{
-		int gravity;
-		bool expand;
-
-		Packing();
+		int gravity = -1;
+		bool expand = false;
 	};
 
 	struct Slot: public sigc::trackable
 	{
 		Layout &layout;
-		int index;
+		int index = 0;
 		Widget &widget;
 		Geometry autosize_geom;
 		Geometry geom;
-		std::list<Constraint> constraints;
+		std::vector<Constraint> constraints;
 		Packing horiz_pack;
 		Packing vert_pack;
-		bool ghost;
+		bool ghost = false;
+		bool floating = false;
 
 		Slot(Layout &, Widget &);
 
@@ -169,22 +172,19 @@ private:
 	class LinearProgram;
 	struct Pointers;
 
-	Container *container;
-	std::list<Slot *> slots;
-	unsigned n_active_slots;
-	unsigned n_slack_constraints[2];
-	Sides margin;
-	unsigned row_spacing;
-	unsigned col_spacing;
+	Container *container = nullptr;
+	std::vector<std::unique_ptr<Slot>> slots;
+	std::size_t n_active_slots = 0;
+	std::size_t n_slack_vars[2] = { 0, 0 };
+	Sides margin{ 8 };
+	unsigned row_spacing = 5;
+	unsigned col_spacing = 4;
 	Geometry autosize_geom;
-	std::list<Arrangement *> arrangement_stack;
+	std::vector<Arrangement *> arrangement_stack;
 
 	static Pointers pointers[2];
 
 public:
-	Layout();
-	~Layout();
-
 	void set_container(Container &);
 	void set_margin(const Sides &);
 	const Sides &get_margin() const { return margin; }
@@ -229,6 +229,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 &);
 
@@ -236,7 +238,7 @@ private:
 	void solve_constraints(int, SolveMode);
 };
 
-void operator>>(const LexicalConverter &, Layout::ConstraintType &);
+MSPGLTK_API void operator>>(const LexicalConverter &, Layout::ConstraintType &);
 
 } // namespace GLtk
 } // namespace Msp