Rework how widget ownership works in Container

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

diff --git a/source/geometry.cpp b/source/geometry.cpp
index 8202774d62913cf894c147aec7d7e287b3828bdc..ba47c0593c620d13bc0a403457fb05c947f31af6 100644 (file)
--- a/source/geometry.cpp
+++ b/source/geometry.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include "geometry.h"
 
 namespace Msp {
@@ -21,47 +14,83 @@ bool Geometry::is_inside_relative(int x_, int y_) const
 }
 
 
-Sides::Sides():
-       top(0),
-       right(0),
-       bottom(0),
-       left(0)
+Sides::Sides(unsigned s):
+       top(s),
+       right(s),
+       bottom(s),
+       left(s)
+{ }
+
+Sides::Sides(unsigned v, unsigned h):
+       top(v),
+       right(h),
+       bottom(v),
+       left(h)
+{ }
+
+Sides::Sides(unsigned t, unsigned h, unsigned b):
+       top(t),
+       right(h),
+       bottom(b),
+       left(h)
+{ }
+
+Sides::Sides(unsigned t, unsigned r, unsigned b, unsigned l):
+       top(t),
+       right(r),
+       bottom(b),
+       left(l)
 { }
 
 
 Sides::Loader::Loader(Sides &s):
-       sides(s)
+       DataFile::ObjectLoader<Sides>(s)
 {
+       add("horizontal", &Loader::horizontal);
+       add("vertical",   &Loader::vertical);
        add("top",    &Sides::top);
        add("right",  &Sides::right);
        add("bottom", &Sides::bottom);
        add("left",   &Sides::left);
 }
 
+void Sides::Loader::horizontal(unsigned h)
+{
+       obj.right = h;
+       obj.left = h;
+}
+
+void Sides::Loader::vertical(unsigned v)
+{
+       obj.top = v;
+       obj.bottom = v;
+}
+
 
 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
 {
-       unsigned pw=parent.w-margin.left-margin.right;
-       unsigned ph=parent.h-margin.bottom-margin.top;
+       Geometry content = parent;
+       content.w -= margin.left+margin.right;
+       content.h -= margin.bottom+margin.top;
 
-       if(parent.w>geom.w)
-               geom.w+=static_cast<unsigned>((pw-geom.w)*w);
-       if(parent.h>geom.h)
-               geom.h+=static_cast<unsigned>((ph-geom.h)*h);
+       geom.x += margin.left;
+       geom.y += margin.bottom;
 
-       geom.x+=static_cast<int>(margin.left+(pw-geom.w)*x);
-       geom.y+=static_cast<int>(margin.bottom+(ph-geom.h)*y);
+       apply(geom, content);
 }
 
 } // namespace GLtk