X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgeometry.cpp;h=0e46743b626ecf9edfffaa3b2b2de00bd0d2d25b;hb=531232cf05838b79c1f8f36c8103730e32dfa23d;hp=126a0fc7aa48b731d72819dc70ec302575062d37;hpb=8f6f543758fb1b2b17ae2db519198d420eb9982d;p=libs%2Fgltk.git

diff --git a/source/geometry.cpp b/source/geometry.cpp
index 126a0fc..0e46743 100644
--- a/source/geometry.cpp
+++ b/source/geometry.cpp
@@ -15,6 +15,11 @@ bool Geometry::is_inside(int x_, int y_) const
 	return (x_>=x && x_<x+static_cast<int>(w) && y_>=y && y_<y+static_cast<int>(h));
 }
 
+bool Geometry::is_inside_relative(int x_, int y_) const
+{
+	return (x_>=0 && x_<static_cast<int>(w) && y_>=0 && y_<static_cast<int>(h));
+}
+
 
 Sides::Sides():
 	top(0),
@@ -37,23 +42,35 @@ Sides::Loader::Loader(Sides &s):
 void Alignment::apply(Geometry &geom, const Geometry &parent) const
 {
 	if(parent.w>geom.w)
+	{
 		geom.w+=static_cast<unsigned>((parent.w-geom.w)*w);
+		geom.x+=static_cast<int>((parent.w-geom.w)*x);
+	}
 	if(parent.h>geom.h)
+	{
 		geom.h+=static_cast<unsigned>((parent.h-geom.h)*h);
-
-	geom.x+=static_cast<int>((parent.w-geom.w)*x);
-	geom.y+=static_cast<int>((parent.h-geom.h)*y);
+		geom.y+=static_cast<int>((parent.h-geom.h)*y);
+	}
 }
 
 void Alignment::apply(Geometry &geom, const Geometry &parent, const Sides &margin) const
 {
-	if(parent.w>geom.w)
-		geom.w+=static_cast<unsigned>((parent.w-geom.w)*w);
-	if(parent.h>geom.h)
-		geom.h+=static_cast<unsigned>((parent.h-geom.h)*h);
+	unsigned pw=parent.w-margin.left-margin.right;
+	unsigned ph=parent.h-margin.bottom-margin.top;
+
+	geom.x+=margin.left;
+	geom.y+=margin.bottom;
 
-	geom.x+=static_cast<int>(margin.left+(parent.w-margin.left-margin.right-geom.w)*x);
-	geom.y+=static_cast<int>(margin.bottom+(parent.h-margin.bottom-margin.top-geom.h)*y);
+	if(pw>geom.w)
+	{
+		geom.w+=static_cast<unsigned>((pw-geom.w)*w);
+		geom.x+=static_cast<int>((pw-geom.w)*x);
+	}
+	if(ph>geom.h)
+	{
+		geom.h+=static_cast<unsigned>((ph-geom.h)*h);
+		geom.y+=static_cast<int>((ph-geom.h)*y);
+	}
 }
 
 } // namespace GLtk