-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
#include "geometry.h"
namespace Msp {
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);
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