X-Git-Url: http://git.tdb.fi/?p=libs%2Fgltk.git;a=blobdiff_plain;f=source%2Flineararrangement.cpp;h=5d18cfb309423bae9a99553264d9031f5ad965e5;hp=9e6441afaa8c72a3cdad8720f56ca0103186b20d;hb=fcccd3471fd3defdc5c10ca5ed096a56015c2467;hpb=fea22d7bdfae9e2cb70a6c0c1a3f85da531e2de2 diff --git a/source/lineararrangement.cpp b/source/lineararrangement.cpp index 9e6441a..5d18cfb 100644 --- a/source/lineararrangement.cpp +++ b/source/lineararrangement.cpp @@ -38,13 +38,13 @@ void LinearArrangement::process_widget(Widget &wdg, Side side, bool aligned) { if(side==opposite) { - bool snug = (edges[primary].aligned && aligned && !split_here); + bool snug = (internal_aligned && aligned && !split_here); add_constraint(wdg, get_order_constraint(primary, !snug), primary); 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,6 +55,9 @@ 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;