X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgeometry.cpp;h=0e46743b626ecf9edfffaa3b2b2de00bd0d2d25b;hb=ef4660c4bdf38e126e13b426649fc2f997027b65;hp=8202774d62913cf894c147aec7d7e287b3828bdc;hpb=c435423919a20a87d100e1ee4cd1fc6ce223040c;p=libs%2Fgltk.git

diff --git a/source/geometry.cpp b/source/geometry.cpp
index 8202774..0e46743 100644
--- a/source/geometry.cpp
+++ b/source/geometry.cpp
@@ -42,12 +42,15 @@ 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
@@ -55,13 +58,19 @@ void Alignment::apply(Geometry &geom, const Geometry &parent, const Sides &margi
 	unsigned pw=parent.w-margin.left-margin.right;
 	unsigned ph=parent.h-margin.bottom-margin.top;
 
-	if(parent.w>geom.w)
+	geom.x+=margin.left;
+	geom.y+=margin.bottom;
+
+	if(pw>geom.w)
+	{
 		geom.w+=static_cast<unsigned>((pw-geom.w)*w);
-	if(parent.h>geom.h)
+		geom.x+=static_cast<int>((pw-geom.w)*x);
+	}
+	if(ph>geom.h)
+	{
 		geom.h+=static_cast<unsigned>((ph-geom.h)*h);
-
-	geom.x+=static_cast<int>(margin.left+(pw-geom.w)*x);
-	geom.y+=static_cast<int>(margin.bottom+(ph-geom.h)*y);
+		geom.y+=static_cast<int>((ph-geom.h)*y);
+	}
 }
 
 } // namespace GLtk