X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flineararrangement.cpp;h=6148be3b38ce4313bb4cb19073dbf958b3a413a6;hb=4b52d16bc895f9d969383d7a7d6a3558c1972cc5;hp=891b858115f016b73900423d69b85a75df382e06;hpb=32539688068fad9614291159b069da10ead10f47;p=libs%2Fgltk.git

diff --git a/source/lineararrangement.cpp b/source/lineararrangement.cpp
index 891b858..6148be3 100644
--- a/source/lineararrangement.cpp
+++ b/source/lineararrangement.cpp
@@ -9,7 +9,8 @@ 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)
 { }
 
 void LinearArrangement::split()
@@ -21,17 +22,30 @@ void LinearArrangement::split()
 	gravity = primary;
 }
 
+void LinearArrangement::expand()
+{
+	if(gravity==primary)
+		throw arrangement_error("already split");
+	if(edges[primary].empty())
+		throw arrangement_error("no widgets");
+
+	add_constraint(*edges[primary].widgets.front(), get_align_constraint(primary), primary);
+	layout.set_expand(*edges[primary].widgets.front(), (primary==LEFT || primary==RIGHT), (primary==TOP || primary==BOTTOM));
+	edges[primary].align();
+	gravity = primary;
+}
+
 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)
@@ -42,6 +56,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;
@@ -52,9 +69,15 @@ void LinearArrangement::finish_slot()
 LinearArrangement::Loader::Loader(LinearArrangement &c):
 	DataFile::ObjectLoader<LinearArrangement>(c)
 {
+	add("expand", &Loader::expand);
 	add("split", &Loader::split);
 }
 
+void LinearArrangement::Loader::expand()
+{
+	obj.expand();
+}
+
 void LinearArrangement::Loader::split()
 {
 	obj.split();