X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgeometry.h;h=cb99cedecb8d6198e89bc869c633eb9a07d55f22;hb=b59fab7e533ef96d72c92b224d4f24718bc6b0a1;hp=08d660eeb05a4b9507968a6f8845924e524f70e1;hpb=c435423919a20a87d100e1ee4cd1fc6ce223040c;p=libs%2Fgltk.git

diff --git a/source/geometry.h b/source/geometry.h
index 08d660e..cb99ced 100644
--- a/source/geometry.h
+++ b/source/geometry.h
@@ -1,14 +1,8 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GLTK_GEOMETRY_H_
 #define MSP_GLTK_GEOMETRY_H_
 
-#include <msp/datafile/loader.h>
+#include <msp/datafile/objectloader.h>
+#include "mspgltk_api.h"
 
 namespace Msp {
 namespace GLtk {
@@ -16,13 +10,16 @@ namespace GLtk {
 /**
 Specifies the position and size of a widget or graphic.
 */
-struct Geometry
+struct MSPGLTK_API Geometry
 {
-	int x, y;
-	unsigned w, h;
+	int x = 0;
+	int y = 0;
+	unsigned w = 1;
+	unsigned h = 1;
 
-	Geometry(): x(0), y(0), w(1), h(1) { }
+	Geometry() = default;
 	Geometry(int x_, int y_, unsigned w_, unsigned h_): x(x_), y(y_), w(w_), h(h_) { }
+
 	bool is_inside(int, int) const;
 	bool is_inside_relative(int, int) const;
 };
@@ -31,35 +28,40 @@ struct Geometry
 /**
 Specifies margins on the sides of an element.
 */
-struct Sides
+struct MSPGLTK_API Sides
 {
-	class Loader: public DataFile::Loader
+	class Loader: public DataFile::ObjectLoader<Sides>
 	{
 	public:
 		Loader(Sides &);
-		Sides &get_object() { return sides; }
 	private:
-		Sides &sides;
+		void horizontal(unsigned);
+		void vertical(unsigned);
 	};
 
-	unsigned top;
-	unsigned right;
-	unsigned bottom;
-	unsigned left;
+	unsigned top = 0;
+	unsigned right = 0;
+	unsigned bottom = 0;
+	unsigned left = 0;
 
-	Sides();
+	Sides() = default;
+	Sides(unsigned);
+	Sides(unsigned, unsigned);
+	Sides(unsigned, unsigned, unsigned);
+	Sides(unsigned, unsigned, unsigned, unsigned);
 };
 
 
 /**
 Performs alignment of nested geometries, such as widgets and their parts.
 */
-struct Alignment
+struct MSPGLTK_API Alignment
 {
-	float x, y;
-	float w, h;
+	float x = 0.0f;
+	float y = 0.0f;
+	float w = 1.0f;
+	float h = 1.0f;
 
-	Alignment(): x(0), y(0), w(1), h(1) { }
 	void apply(Geometry &, const Geometry &) const;
 	void apply(Geometry &, const Geometry &, const Sides &) const;
 };