Add a VSlider to multiline Entries

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

diff --git a/source/geometry.cpp b/source/geometry.cpp
index 6183928673f2e51b1344335550dfe76cf8d99b05..8163022ccdc981220280c938864427afb66c4630 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),
@@ -33,5 +38,40 @@ 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
+{
+       unsigned pw = parent.w-margin.left-margin.right;
+       unsigned ph = parent.h-margin.bottom-margin.top;
+
+       geom.x += margin.left;
+       geom.y += margin.bottom;
+
+       if(pw>geom.w)
+       {
+               geom.w += static_cast<unsigned>((pw-geom.w)*w);
+               geom.x += static_cast<int>((pw-geom.w)*x);
+       }
+       if(ph>geom.h)
+       {
+               geom.h += static_cast<unsigned>((ph-geom.h)*h);
+               geom.y += static_cast<int>((ph-geom.h)*y);
+       }
+}
+
 } // namespace GLtk
 } // namespace Msp