Style and comment updates

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

diff --git a/source/geometry.h b/source/geometry.h
index 9945fabcd8645a63e093ce8de5b6939e87c2fd80..cb99cedecb8d6198e89bc869c633eb9a07d55f22 100644 (file)
--- a/source/geometry.h
+++ b/source/geometry.h
@@ -2,6 +2,7 @@
 #define MSP_GLTK_GEOMETRY_H_
 
 #include <msp/datafile/objectloader.h>
+#include "mspgltk_api.h"
 
 namespace Msp {
 namespace GLtk {
@@ -9,13 +10,16 @@ namespace GLtk {
 /**
 Specifies the position and size of a widget or graphic.
 */
-struct Geometry
+struct MSPGLTK_API Geometry
 {
-       int x, y;
-       unsigned w, h;
+       int x = 0;
+       int y = 0;
+       unsigned w = 1;
+       unsigned h = 1;
 
-       Geometry(): x(0), y(0), w(1), h(1) { }
+       Geometry() = default;
        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;
 };
@@ -24,20 +28,23 @@ struct Geometry
 /**
 Specifies margins on the sides of an element.
 */
-struct Sides
+struct MSPGLTK_API Sides
 {
        class Loader: public DataFile::ObjectLoader<Sides>
        {
        public:
                Loader(Sides &);
+       private:
+               void horizontal(unsigned);
+               void vertical(unsigned);
        };
 
-       unsigned top;
-       unsigned right;
-       unsigned bottom;
-       unsigned left;
+       unsigned top = 0;
+       unsigned right = 0;
+       unsigned bottom = 0;
+       unsigned left = 0;
 
-       Sides();
+       Sides() = default;
        Sides(unsigned);
        Sides(unsigned, unsigned);
        Sides(unsigned, unsigned, unsigned);
@@ -48,12 +55,13 @@ struct Sides
 /**
 Performs alignment of nested geometries, such as widgets and their parts.
 */
-struct Alignment
+struct MSPGLTK_API Alignment
 {
-       float x, y;
-       float w, h;
+       float x = 0.0f;
+       float y = 0.0f;
+       float w = 1.0f;
+       float h = 1.0f;
 
-       Alignment(): x(0), y(0), w(1), h(1) { }
        void apply(Geometry &, const Geometry &) const;
        void apply(Geometry &, const Geometry &, const Sides &) const;
 };