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

diff --git a/source/geometry.cpp b/source/geometry.cpp
index d7a0756..b7e89c0 100644
--- a/source/geometry.cpp
+++ b/source/geometry.cpp
@@ -8,6 +8,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),
@@ -16,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);
@@ -26,5 +59,32 @@ Sides::Loader::Loader(Sides &s):
 	add("left",   &Sides::left);
 }
 
+
+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);
+	}
+	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);
+	}
+}
+
+void Alignment::apply(Geometry &geom, const Geometry &parent, const Sides &margin) const
+{
+	Geometry content = parent;
+	content.w -= margin.left+margin.right;
+	content.h -= margin.bottom+margin.top;
+
+	geom.x += margin.left;
+	geom.y += margin.bottom;
+
+	apply(geom, content);
+}
+
 } // namespace GLtk
 } // namespace Msp