Allow overriding the spacing between two widgets in LinearArrangement

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

diff --git a/source/lineararrangement.cpp b/source/lineararrangement.cpp
index 9e6441afaa8c72a3cdad8720f56ca0103186b20d..fb2e71c180dac87aa81c41ec3fce0d6c80b06a4b 100644 (file)
--- a/source/lineararrangement.cpp
+++ b/source/lineararrangement.cpp
@@ -9,7 +9,9 @@ LinearArrangement::LinearArrangement(Layout &l, Side p):
        opposite(static_cast<Side>((primary+2)%4)),
        first(true),
        split_here(false),
-       gravity(opposite)
+       gravity(opposite),
+       internal_aligned(false),
+       next_spacing(-1)
 { }
 
 void LinearArrangement::split()
@@ -29,22 +31,27 @@ void LinearArrangement::expand()
                throw arrangement_error("no widgets");
 
        add_constraint(*edges[primary].widgets.front(), get_align_constraint(primary), primary);
-       layout.set_expand(*edges[primary].widgets.front(), false, true);
+       layout.set_expand(*edges[primary].widgets.front(), (primary==LEFT || primary==RIGHT), (primary==TOP || primary==BOTTOM));
        edges[primary].align();
        gravity = primary;
 }
 
+void LinearArrangement::spacing(unsigned s)
+{
+       next_spacing = s;
+}
+
 void LinearArrangement::process_widget(Widget &wdg, Side side, bool aligned)
 {
        if(side==opposite)
        {
-               bool snug = (edges[primary].aligned && aligned && !split_here);
-               add_constraint(wdg, get_order_constraint(primary, !snug), primary);
+               bool snug = (internal_aligned && aligned && !split_here);
+               add_constraint(wdg, get_order_constraint(primary, !snug), primary, next_spacing);
                if(first)
-                       edges[side].add(wdg, aligned);
+                       edges[side].add(wdg, (aligned && gravity==opposite));
        }
        else if(side==primary)
-               next.add(wdg, (aligned && gravity==primary));
+               next.add(wdg, aligned);
        else
        {
                if(edges[side].aligned && aligned)
@@ -55,10 +62,14 @@ void LinearArrangement::process_widget(Widget &wdg, Side side, bool aligned)
 
 void LinearArrangement::finish_slot()
 {
+       internal_aligned = next.aligned;
+       if(gravity!=primary)
+               next.aligned = false;
        edges[primary] = next;
        next.clear();
        split_here = false;
        first = false;
+       next_spacing = -1;
 }
 
 
@@ -66,6 +77,7 @@ LinearArrangement::Loader::Loader(LinearArrangement &c):
        DataFile::ObjectLoader<LinearArrangement>(c)
 {
        add("expand", &Loader::expand);
+       add("spacing", &Loader::spacing);
        add("split", &Loader::split);
 }
 
@@ -74,6 +86,11 @@ void LinearArrangement::Loader::expand()
        obj.expand();
 }
 
+void LinearArrangement::Loader::spacing(unsigned s)
+{
+       obj.spacing(s);
+}
+
 void LinearArrangement::Loader::split()
 {
        obj.split();