Refactor filling from Part to Alignment

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

diff --git a/source/geometry.cpp b/source/geometry.cpp
index 81efcd05bad2e69d22325eb3e7df851f638d3644..126a0fc7aa48b731d72819dc70ec302575062d37 100644 (file)
--- a/source/geometry.cpp
+++ b/source/geometry.cpp
@@ -36,12 +36,22 @@ 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);
+       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);
 }
 
 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);
+
        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);
 }