Allow specifying a custom spacing for a constraint

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

diff --git a/source/layout.h b/source/layout.h
index 7e8cdea123fc1a25f845bfb5ecf3e272df9d9b57..230365182e1d84a881bc363a48487234215fd3a7 100644 (file)
--- a/source/layout.h
+++ b/source/layout.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2011  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-

 #ifndef MSP_GLTK_LAYOUT_H_
 #define MSP_GLTK_LAYOUT_H_
 
 #ifndef MSP_GLTK_LAYOUT_H_
 #define MSP_GLTK_LAYOUT_H_
 


@@ -27,11 +20,11 @@ is then solved to obtain positions and dimensions that fulfill the constraints.
 There are three kinds of constraints available: ordering, alignment and
 dimension matching.
 
 There are three kinds of constraints available: ordering, alignment and
 dimension matching.
 

-Ordering constraints specify that the widgets should be placed next to other
-along X or Y axis.  These operate on one axis at a time, so a widget could be
-"right of" another even if they are separated by hundreds of pixels vertically.
-The widgets will be separated by a spacing value, which is settable on a per-
-layout basis.
+Ordering constraints specify that the widgets should be placed next to each
+other along X or Y axis.  These operate on one axis at a time, so a widget
+could be "right of" another even if they are separated by hundreds of pixels
+vertically.  The widgets will be separated by a spacing value, which is
+settable on a per-layout basis.

 
 Alignment constraints make the corresponding edges of two widgets be on the
 same line.  These are incompatible with ordering constraints, so only one or
 
 Alignment constraints make the corresponding edges of two widgets be on the
 same line.  These are incompatible with ordering constraints, so only one or


@@ -52,8 +45,8 @@ dependent widgets have the expand flag set, the results are currently
 undefined.
 
 Since specifiyng constraints manually can be quite tedious, there are some
 undefined.
 
 Since specifiyng constraints manually can be quite tedious, there are some

-derived Layout classes that implement common positioning patterns.  See
-MixedRows and Grid.
+derived Layout classes that implement common positioning patterns.  See Row,
+Column, MixedRows and Grid.

 */
 class Layout
 {
 */
 class Layout
 {


@@ -91,6 +84,7 @@ protected:
        {
                ConstraintType type;
                Slot ⌖
        {
                ConstraintType type;
                Slot ⌖

+               int spacing;

 
                Constraint(ConstraintType, Slot &);
        };
 
                Constraint(ConstraintType, Slot &);
        };


@@ -108,6 +102,7 @@ protected:
                Layout &layout;
                unsigned index;
                Widget &widget;
                Layout &layout;
                unsigned index;
                Widget &widget;

+               Geometry autosize_geom;

                Geometry geom;
                std::list<Constraint> constraints;
                Packing horiz_pack;
                Geometry geom;
                std::list<Constraint> constraints;
                Packing horiz_pack;


@@ -119,6 +114,12 @@ protected:
                void autosize_changed();
        };
 
                void autosize_changed();
        };
 

+       enum SolveMode
+       {
+               UPDATE,
+               AUTOSIZE
+       };
+

        class LinearProgram;
        struct Pointers;
 
        class LinearProgram;
        struct Pointers;
 


@@ -127,6 +128,7 @@ protected:
        Sides margin;
        unsigned row_spacing;
        unsigned col_spacing;
        Sides margin;
        unsigned row_spacing;
        unsigned col_spacing;

+       Geometry autosize_geom;

 
        static Pointers pointers[2];
 
 
        static Pointers pointers[2];
 


@@ -146,17 +148,24 @@ protected:
        virtual Slot *create_slot(Widget &);
        Slot &get_slot_for_widget(Widget &);
        static ConstraintType complement(ConstraintType);
        virtual Slot *create_slot(Widget &);
        Slot &get_slot_for_widget(Widget &);
        static ConstraintType complement(ConstraintType);

+       void create_constraint(Widget &, ConstraintType, Widget &, int);
+

 public:
 public:

-       void add_constraint(Widget &, ConstraintType, Widget &);
+       /** Adds a constraint between two widgets. */
+       void add_constraint(Widget &src, ConstraintType type, Widget &tgt);
+
+       /** Adds a constraint between two widgets, overriding the default spacing.
+       Not all constraint types use a spacing. */
+       void add_constraint(Widget &src, ConstraintType type, Widget &tgt, unsigned);
+

        void set_gravity(Widget &, int, int);
        void set_expand(Widget &, bool, bool);
 
        void update();
        void set_gravity(Widget &, int, int);
        void set_expand(Widget &, bool, bool);
 
        void update();

+       void autosize();

 
 protected:
 
 protected:

-       void find_constraint_group(Slot &, ConstraintType, std::set<Slot *> &);
-       void sort_slots(std::list<Slot *> &, ConstraintType);
-       void solve_constraints(int);
+       void solve_constraints(int, SolveMode);

 };
 
 } // namespace GLtk
 };
 
 } // namespace GLtk