Allow Root widgets to be created with custom input devices

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

diff --git a/source/geometry.h b/source/geometry.h
index fdef8ace97d45557d9450f4fca535c3fc2446e01..9945fabcd8645a63e093ce8de5b6939e87c2fd80 100644 (file)
--- a/source/geometry.h
+++ b/source/geometry.h
@@ -1,7 +1,7 @@
 #ifndef MSP_GLTK_GEOMETRY_H_
 #define MSP_GLTK_GEOMETRY_H_
 
-#include <msp/datafile/loader.h>
+#include <msp/datafile/objectloader.h>
 
 namespace Msp {
 namespace GLtk {
@@ -17,20 +17,19 @@ struct Geometry
        Geometry(): x(0), y(0), w(1), h(1) { }
        Geometry(int x_, int y_, unsigned w_, unsigned h_): x(x_), y(y_), w(w_), h(h_) { }
        bool is_inside(int, int) const;
+       bool is_inside_relative(int, int) const;
 };
 
+
 /**
 Specifies margins on the sides of an element.
 */
 struct Sides
 {
-       class Loader: public DataFile::Loader
+       class Loader: public DataFile::ObjectLoader<Sides>
        {
        public:
                Loader(Sides &);
-               Sides &get_object() { return sides; }
-       private:
-               Sides &sides;
        };
 
        unsigned top;
@@ -39,6 +38,24 @@ struct Sides
        unsigned left;
 
        Sides();
+       Sides(unsigned);
+       Sides(unsigned, unsigned);
+       Sides(unsigned, unsigned, unsigned);
+       Sides(unsigned, unsigned, unsigned, unsigned);
+};
+
+
+/**
+Performs alignment of nested geometries, such as widgets and their parts.
+*/
+struct Alignment
+{
+       float x, y;
+       float w, h;
+
+       Alignment(): x(0), y(0), w(1), h(1) { }
+       void apply(Geometry &, const Geometry &) const;
+       void apply(Geometry &, const Geometry &, const Sides &) const;
 };
 
 } // namespace GLtk