X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flayout.cpp;h=c616ff6fc7caff9833070cf1c30e7c7710e20ad9;hb=8eeb6ee5d40c21150839e24996cc3e9ef308374d;hp=993c82f42c7ce0d8f683065d9cf4d01f127cd895;hpb=7a0f255ecf23391f09488ac54fb9b1124827dfa7;p=libs%2Fgltk.git

diff --git a/source/layout.cpp b/source/layout.cpp
index 993c82f..c616ff6 100644
--- a/source/layout.cpp
+++ b/source/layout.cpp
@@ -1,5 +1,8 @@
 #include <algorithm>
 #include <limits>
+#include <msp/core/maputils.h>
+#include <msp/strings/format.h>
+#include "arrangement.h"
 #include "container.h"
 #include "layout.h"
 #include "widget.h"
@@ -136,16 +139,45 @@ void Layout::set_column_spacing(unsigned s)
 		update();
 }
 
+void Layout::push_arrangement(Arrangement &arr)
+{
+	arrangement_stack.push_back(&arr);
+}
+
+Arrangement *Layout::get_arrangement() const
+{
+	if(arrangement_stack.empty())
+		return 0;
+	else
+		return arrangement_stack.back();
+}
+
+void Layout::pop_arrangement(Arrangement &arr)
+{
+	list<Arrangement *>::iterator begin = find(arrangement_stack.begin(), arrangement_stack.end(), &arr);
+	if(begin==arrangement_stack.end())
+		return;
+
+	while(1)
+	{
+		Arrangement *top = arrangement_stack.back();
+		arrangement_stack.pop_back();
+		if(!arrangement_stack.empty())
+			arrangement_stack.back()->arrange(*top);
+		if(top==&arr)
+			break;
+	}
+}
+
 void Layout::add_widget(Widget &wdg)
 {
 	if(!container)
 		throw logic_error("!container");
 
-	Slot *slot = create_slot(wdg);
-	for(list<Constraint>::iterator i=slot->constraints.begin(); i!=slot->constraints.end(); ++i)
-		i->target.constraints.push_back(Constraint(complement(i->type), *slot));
-	slots.push_back(slot);
+	slots.push_back(new Slot(*this, wdg));
 	update_slot_indices();
+	if(!arrangement_stack.empty())
+		arrangement_stack.back()->arrange(wdg);
 	if(container)
 		update();
 }
@@ -176,11 +208,6 @@ void Layout::remove_widget(Widget &wdg)
 		}
 }
 
-Layout::Slot *Layout::create_slot(Widget &wdg)
-{
-	return new Slot(*this, wdg);
-}
-
 void Layout::update_slot_indices()
 {
 	n_active_slots = 0;
@@ -455,6 +482,110 @@ void Layout::Slot::visibility_changed(bool v)
 }
 
 
+Layout::Loader::Loader(Layout &l, const WidgetMap &wm):
+	DataFile::ObjectLoader<Layout>(l),
+	wdg_map(wm)
+{
+	add("column_spacing", &Loader::column_spacing);
+	add("margin",         &Loader::margin);
+	add("row_spacing",    &Loader::row_spacing);
+	add("spacing",        &Loader::spacing);
+	add("widget",         &Loader::widget);
+}
+
+void Layout::Loader::column_spacing(unsigned s)
+{
+	obj.set_column_spacing(s);
+}
+
+void Layout::Loader::margin()
+{
+	Sides sides;
+	load_sub(sides);
+	obj.set_margin(sides);
+}
+
+void Layout::Loader::spacing(unsigned s)
+{
+	obj.set_spacing(s);
+}
+
+void Layout::Loader::row_spacing(unsigned s)
+{
+	obj.set_row_spacing(s);
+}
+
+void Layout::Loader::widget(const string &n)
+{
+	Widget &wdg = *get_item(wdg_map, n);
+	WidgetLoader ldr(obj, wdg, wdg_map);
+	load_sub_with(ldr);
+}
+
+
+Layout::WidgetLoader::WidgetLoader(Layout &l, Widget &w, const Layout::Loader::WidgetMap &wm):
+	layout(l),
+	widget(w),
+	wdg_map(wm)
+{
+	add("constraint", &WidgetLoader::constraint);
+	add("expand",     &WidgetLoader::expand);
+	add("gravity",    &WidgetLoader::gravity);
+}
+
+void Layout::WidgetLoader::constraint(ConstraintType type, const string &n)
+{
+	Widget &target = *get_item(wdg_map, n);
+	layout.add_constraint(widget, type, target);
+}
+
+void Layout::WidgetLoader::expand(bool h, bool v)
+{
+	layout.set_expand(widget, h, v);
+}
+
+void Layout::WidgetLoader::gravity(int h, int v)
+{
+	layout.set_gravity(widget, h, v);
+}
+
+
+void operator>>(const LexicalConverter &conv, Layout::ConstraintType &ctype)
+{
+	const string &str = conv.get();
+	if(str=="ABOVE")
+		ctype = Layout::ABOVE;
+	else if(str=="BELOW")
+		ctype = Layout::BELOW;
+	else if(str=="RIGHT_OF")
+		ctype = Layout::RIGHT_OF;
+	else if(str=="LEFT_OF")
+		ctype = Layout::LEFT_OF;
+	else if(str=="FAR_ABOVE")
+		ctype = Layout::FAR_ABOVE;
+	else if(str=="FAR_BELOW")
+		ctype = Layout::FAR_BELOW;
+	else if(str=="FAR_RIGHT_OF")
+		ctype = Layout::FAR_RIGHT_OF;
+	else if(str=="FAR_LEFT_OF")
+		ctype = Layout::FAR_LEFT_OF;
+	else if(str=="ALIGN_TOP")
+		ctype = Layout::ALIGN_TOP;
+	else if(str=="ALIGN_BOTTOM")
+		ctype = Layout::ALIGN_BOTTOM;
+	else if(str=="ALIGN_RIGHT")
+		ctype = Layout::ALIGN_RIGHT;
+	else if(str=="ALIGN_LEFT")
+		ctype = Layout::ALIGN_LEFT;
+	else if(str=="COPY_WIDTH")
+		ctype = Layout::COPY_WIDTH;
+	else if(str=="COPY_HEIGHT")
+		ctype = Layout::COPY_HEIGHT;
+	else
+		throw lexical_error(format("conversion of '%s' to ConstraintType", str));
+}
+
+
 Layout::LinearProgram::LinearProgram(unsigned s):
 	n_columns(s),
 	n_rows(1),