X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Farrangement.h;h=26e28a6f10f4967b45b480a8bd76005e84672f22;hb=762a689d799075c0a10e1633bf95d53de80b4572;hp=ed1798b8a74856fcd18d2fc96bb9a9d12051a509;hpb=304500a51a1a9d00e3c84ed2a6ffda0f829445b4;p=libs%2Fgltk.git

diff --git a/source/arrangement.h b/source/arrangement.h
index ed1798b..26e28a6 100644
--- a/source/arrangement.h
+++ b/source/arrangement.h
@@ -1,23 +1,24 @@
 #ifndef MSP_GLTK_ARRANGEMENT_H_
 #define MSP_GLTK_ARRANGEMENT_H_
 
-#include <list>
 #include <stdexcept>
+#include <vector>
+#include <msp/core/noncopyable.h>
 #include "layout.h"
+#include "mspgltk_api.h"
 
 namespace Msp {
 namespace GLtk {
 
 class Widget;
 
-class arrangement_error: public std::logic_error
+class MSPGLTK_API arrangement_error: public std::logic_error
 {
 public:
 	arrangement_error(const std::string &w): std::logic_error(w) { }
-	virtual ~arrangement_error() throw() { }
 };
 
-class Arrangement
+class MSPGLTK_API Arrangement: public NonCopyable
 {
 protected:
 	enum Side
@@ -30,18 +31,17 @@ protected:
 
 	struct Edge
 	{
-		std::list<Widget *> widgets;
-		bool aligned;
-
-		Edge();
+		std::vector<Widget *> widgets;
+		bool aligned = false;
 
 		bool empty() { return widgets.empty(); }
 		void clear();
 		void add(Widget &, bool);
+		void align();
 	};
 
 	Layout &layout;
-	Arrangement *parent;
+	Arrangement *parent = nullptr;
 	Edge edges[4];
 
 	Arrangement(Layout &);
@@ -56,8 +56,11 @@ protected:
 	virtual void finish_widget(Widget &) = 0;
 	virtual void finish_slot() = 0;
 	const Edge &get_edge(Side s) const { return edges[s]; }
-	void add_constraint(Widget &, Layout::ConstraintType, Side);
-	void add_constraint(Widget &, Layout::ConstraintType, const Edge &);
+	void add_constraint(Widget &, Layout::ConstraintType, Side, int = -1);
+	void add_constraint(Widget &, Layout::ConstraintType, const Edge &, int = -1);
+
+	static Layout::ConstraintType get_order_constraint(Side, bool);
+	static Layout::ConstraintType get_align_constraint(Side);
 };
 
 } // namespace GLtk