X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flineararrangement.h;h=6f3c26ace105f96d4a47c2230d9d1fa930a1e4a0;hb=b59fab7e533ef96d72c92b224d4f24718bc6b0a1;hp=4b149a4ad2d7284901dea33d995f361ae78cf985;hpb=d85d9bd7dae120e3e7ebaf64e7b78a975fab94a6;p=libs%2Fgltk.git

diff --git a/source/lineararrangement.h b/source/lineararrangement.h
index 4b149a4..6f3c26a 100644
--- a/source/lineararrangement.h
+++ b/source/lineararrangement.h
@@ -3,43 +3,50 @@
 
 #include <msp/datafile/objectloader.h>
 #include "arrangement.h"
+#include "mspgltk_api.h"
 
 namespace Msp {
 namespace GLtk {
 
-class LinearArrangement: public Arrangement
+class MSPGLTK_API LinearArrangement: public Arrangement
 {
 public:
-	class Loader: public DataFile::ObjectLoader<LinearArrangement>
+	class MSPGLTK_API Loader: public DataFile::ObjectLoader<LinearArrangement>
 	{
 	public:
 		Loader(LinearArrangement &);
+
 	private:
 		void expand();
 		void spacing(unsigned);
 		void split();
+		void uniform(bool);
 	};
 
 protected:
-	Side primary;
-	Side opposite;
+	Side primary = RIGHT;
+	Side opposite = static_cast<Side>(primary^2);
 	Edge next;
-	bool first;
-	bool split_here;
-	Side gravity;
-	bool internal_aligned;
-	int next_spacing;
+	bool first = true;
+	bool split_here = false;
+	Side gravity = opposite;
+	bool internal_aligned = false;
+	bool uniform = false;
+	Widget *uniform_ref = nullptr;
+	int next_spacing = -1;
 
 	LinearArrangement(Layout &, Side);
 
 public:
+	void set_uniform(bool);
 	void split();
 	void expand();
 	void spacing(unsigned);
 
 protected:
-	virtual void process_widget(Widget &, Side, bool);
-	virtual void finish_slot();
+	void process_widget(Widget &, Side, bool) override;
+	void finish_widget(Widget &) override;
+	void finish_slot() override;
 };
 
 } // namespace GLtk