Pass coordinates relative to the receiving widget's geometry

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

diff --git a/source/geometry.cpp b/source/geometry.cpp
index 126a0fc7aa48b731d72819dc70ec302575062d37..8202774d62913cf894c147aec7d7e287b3828bdc 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),
@@ -47,13 +52,16 @@ void Alignment::apply(Geometry &geom, const Geometry &parent) const
 
 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;
+
        if(parent.w>geom.w)
-               geom.w+=static_cast<unsigned>((parent.w-geom.w)*w);
+               geom.w+=static_cast<unsigned>((pw-geom.w)*w);
        if(parent.h>geom.h)
-               geom.h+=static_cast<unsigned>((parent.h-geom.h)*h);
+               geom.h+=static_cast<unsigned>((ph-geom.h)*h);
 
-       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);
+       geom.x+=static_cast<int>(margin.left+(pw-geom.w)*x);
+       geom.y+=static_cast<int>(margin.bottom+(ph-geom.h)*y);
 }
 
 } // namespace GLtk