Implement autosize() method for most widgets

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

diff --git a/source/geometry.cpp b/source/geometry.cpp
index 126a0fc7aa48b731d72819dc70ec302575062d37..5c304d389a631eab7c63c905b28425bcaaa7c5da 100644 (file)
--- 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),
@@ -25,7 +30,7 @@ Sides::Sides():
 
 
 Sides::Loader::Loader(Sides &s):
-       sides(s)
+       DataFile::ObjectLoader<Sides>(s)
 {
        add("top",    &Sides::top);
        add("right",  &Sides::right);
@@ -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.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.h += static_cast<unsigned>((parent.h-geom.h)*h);
+               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