Fix Alignment to not fail when geom is larger han parent

[libs/gltk.git] / source / geometry.cpp

diff --git a/source/geometry.cpp b/source/geometry.cpp
index 8202774d62913cf894c147aec7d7e287b3828bdc..584a1aac55d934185e7bc68e793329a11d935a68 100644 (file)
--- 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;
 
+       geom.x+=margin.left;
+       geom.y+=margin.bottom;
+
        if(parent.w>geom.w)
+       {
                geom.w+=static_cast<unsigned>((pw-geom.w)*w);
+               geom.x+=static_cast<int>((pw-geom.w)*x);
+       }
        if(parent.h>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