X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgeometry.cpp;h=b7e89c06bb34be3318562e34f3918b66bcbedc39;hb=b51fd94242badcd3807a39c339979f4f358120cd;hp=584a1aac55d934185e7bc68e793329a11d935a68;hpb=a9d04a73afcdf40c33d889090d303117b7fd3a7d;p=libs%2Fgltk.git

diff --git a/source/geometry.cpp b/source/geometry.cpp
index 584a1aa..b7e89c0 100644
--- 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 {
@@ -28,9 +21,37 @@ Sides::Sides():
 	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("top",    &Sides::top);
 	add("right",  &Sides::right);
@@ -43,34 +64,26 @@ 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);
+		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.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;
 
-	geom.x+=margin.left;
-	geom.y+=margin.bottom;
+	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.y+=static_cast<int>((ph-geom.h)*y);
-	}
+	apply(geom, content);
 }
 
 } // namespace GLtk