X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgeometry.h;h=1451a0633e23b5b1107b1ae39f91338820e170ce;hb=c8291177b545ec81930603a5915234a60296db51;hp=85e28161930841dfa1bb358b4489c16e888935f7;hpb=c062ca892fc6e10f74a76991b5d4b4349c046b5f;p=libs%2Fgltk.git

diff --git a/source/geometry.h b/source/geometry.h
index 85e2816..1451a06 100644
--- a/source/geometry.h
+++ b/source/geometry.h
@@ -1,7 +1,7 @@
 #ifndef MSP_GLTK_GEOMETRY_H_
 #define MSP_GLTK_GEOMETRY_H_
 
-#include <msp/parser/loader.h>
+#include <msp/datafile/objectloader.h>
 
 namespace Msp {
 namespace GLtk {
@@ -17,20 +17,22 @@ struct Geometry
 	Geometry(): x(0), y(0), w(1), h(1) { }
 	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;
 };
 
+
 /**
 Specifies margins on the sides of an element.
 */
 struct Sides
 {
-	class Loader: public Parser::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;
@@ -39,6 +41,24 @@ struct Sides
 	unsigned left;
 
 	Sides();
+	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
+{
+	float x, y;
+	float w, h;
+
+	Alignment(): x(0), y(0), w(1), h(1) { }
+	void apply(Geometry &, const Geometry &) const;
+	void apply(Geometry &, const Geometry &, const Sides &) const;
 };
 
 } // namespace GLtk