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

diff --git a/source/geometry.h b/source/geometry.h
index 6dc9827..08d660e 100644
--- a/source/geometry.h
+++ b/source/geometry.h
@@ -24,8 +24,10 @@ 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.
 */
@@ -48,6 +50,20 @@ struct Sides
 	Sides();
 };
 
+
+/**
+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
 } // namespace Msp