Use nullptr instead of 0 for pointers

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

diff --git a/source/layout.h b/source/layout.h
index 043d92cc1554b738092ce3ad771fcf5bb3cc5049..aa11e965bf19cbc042b968c65d38506686625f27 100644 (file)
--- a/source/layout.h
+++ b/source/layout.h
@@ -6,6 +6,7 @@
 #include <sigc++/trackable.h>
 #include <msp/strings/lexicalcast.h>
 #include "geometry.h"
+#include "mspgltk_api.h"
 
 namespace Msp {
 namespace GLtk {
@@ -50,7 +51,7 @@ Since specifiyng constraints manually can be quite tedious, an Arrangement
 interface is provided to automatically arrange widgets.  See classes Row,
 Column and Grid for some commonly used arrangements.
 */
-class Layout
+class MSPGLTK_API Layout
 {
 private:
        enum
@@ -63,8 +64,9 @@ private:
                TARGET_POS = 8,
                TARGET_DIM = 16,
                TARGET_MASK = 24,
-               SPACING = 32,
-               SLACK = 64
+               HALF_DIM = 32,
+               SPACING = 64,
+               SLACK = 128
        };
 
 public:
@@ -79,8 +81,10 @@ public:
                FAR_RIGHT_OF = HORIZONTAL|SELF_POS|TARGET_POS|TARGET_DIM|SPACING|SLACK,
                FAR_LEFT_OF = HORIZONTAL|SELF_POS|SELF_DIM|TARGET_POS|SPACING|SLACK,
                ALIGN_TOP = VERTICAL|SELF_POS|SELF_DIM|TARGET_POS|TARGET_DIM,
+               ALIGN_VCENTER = VERTICAL|SELF_POS|SELF_DIM|TARGET_POS|TARGET_DIM|HALF_DIM,
                ALIGN_BOTTOM = VERTICAL|SELF_POS|TARGET_POS,
                ALIGN_RIGHT = HORIZONTAL|SELF_POS|SELF_DIM|TARGET_POS|TARGET_DIM,
+               ALIGN_HCENTER = HORIZONTAL|SELF_POS|SELF_DIM|TARGET_POS|TARGET_DIM|HALF_DIM,
                ALIGN_LEFT = HORIZONTAL|SELF_POS|TARGET_POS,
                COPY_WIDTH = HORIZONTAL|SELF_DIM|TARGET_DIM,
                COPY_HEIGHT = VERTICAL|SELF_DIM|TARGET_DIM
@@ -129,30 +133,29 @@ private:
        {
                ConstraintType type;
                Slot &target;
-               int spacing;
+               int spacing = -1;
 
                Constraint(ConstraintType, Slot &);
        };
 
        struct Packing
        {
-               int gravity;
-               bool expand;
-
-               Packing();
+               int gravity = -1;
+               bool expand = false;
        };
 
        struct Slot: public sigc::trackable
        {
                Layout &layout;
-               int index;
+               int index = 0;
                Widget &widget;
                Geometry autosize_geom;
                Geometry geom;
                std::list<Constraint> constraints;
                Packing horiz_pack;
                Packing vert_pack;
-               bool ghost;
+               bool ghost = false;
+               bool floating = false;
 
                Slot(Layout &, Widget &);
 
@@ -169,20 +172,19 @@ private:
        class LinearProgram;
        struct Pointers;
 
-       Container *container;
+       Container *container = nullptr;
        std::list<Slot *> slots;
-       unsigned n_active_slots;
-       unsigned n_slack_vars[2];
-       Sides margin;
-       unsigned row_spacing;
-       unsigned col_spacing;
+       unsigned n_active_slots = 0;
+       unsigned n_slack_vars[2] = { 0, 0 };
+       Sides margin{ 8 };
+       unsigned row_spacing = 5;
+       unsigned col_spacing = 4;
        Geometry autosize_geom;
        std::list<Arrangement *> arrangement_stack;
 
        static Pointers pointers[2];
 
 public:
-       Layout();
        ~Layout();
 
        void set_container(Container &);
@@ -229,6 +231,8 @@ public:
        /// Sets a widget as a ghost, taking up space even if it is hidden.
        void set_ghost(Widget &, bool);
 
+       void set_floating(Widget &, bool);
+
        void update();
        void autosize(Geometry &);
 
@@ -236,7 +240,7 @@ private:
        void solve_constraints(int, SolveMode);
 };
 
-void operator>>(const LexicalConverter &, Layout::ConstraintType &);
+MSPGLTK_API void operator>>(const LexicalConverter &, Layout::ConstraintType &);
 
 } // namespace GLtk
 } // namespace Msp