X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgeometry.h;h=08d660eeb05a4b9507968a6f8845924e524f70e1;hb=3f301f9b6f73e886bdbb61565edb2c02667039d0;hp=6559414dd0497ae5cdd8a8e8a0136ed6af062876;hpb=ed9873ba7ee862ad76937f579fe371c1a27d5715;p=libs%2Fgltk.git

diff --git a/source/geometry.h b/source/geometry.h
index 6559414..08d660e 100644
--- a/source/geometry.h
+++ b/source/geometry.h
@@ -24,6 +24,7 @@ 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;
 };
 
 
@@ -56,9 +57,9 @@ Performs alignment of nested geometries, such as widgets and their parts.
 struct Alignment
 {
 	float x, y;
+	float w, h;
 
-	Alignment(): x(0), y(0) { }
-	Alignment(float x_, float y_): x(x_), y(y_) { }
+	Alignment(): x(0), y(0), w(1), h(1) { }
 	void apply(Geometry &, const Geometry &) const;
 	void apply(Geometry &, const Geometry &, const Sides &) const;
 };