X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpanel.cpp;h=dc2808ed4bf5a237d97aad9cd1ec75e068ac7580;hb=10c448468c4e225fab701e69bdc296422bb3f509;hp=a086a4e443f6fbebc779e570e9b29500063bbd03;hpb=d88af5a7898020e4493fef8ec0cb9e88666b66df;p=libs%2Fgltk.git

diff --git a/source/panel.cpp b/source/panel.cpp
index a086a4e..dc2808e 100644
--- a/source/panel.cpp
+++ b/source/panel.cpp
@@ -1,16 +1,21 @@
 #include <algorithm>
+#include <msp/core/maputils.h>
 #include <msp/core/refptr.h>
 #include "button.h"
+#include "column.h"
+#include "draghandle.h"
 #include "dropdown.h"
 #include "entry.h"
+#include "grid.h"
 #include "hslider.h"
+#include "image.h"
 #include "indicator.h"
 #include "label.h"
-#include "layout.h"
 #include "list.h"
 #include "panel.h"
 #include "part.h"
-#include "table.h"
+#include "row.h"
+#include "stack.h"
 #include "toggle.h"
 #include "vslider.h"
 
@@ -20,11 +25,10 @@ namespace Msp {
 namespace GLtk {
 
 Panel::Panel():
-	layout(0),
-	pointer_focus(0),
-	pointer_grabbed(false),
-	input_focus(0)
-{ }
+	layout(0)
+{
+	input_type = INPUT_NAVIGATION;
+}
 
 Panel::~Panel()
 {
@@ -39,260 +43,247 @@ void Panel::set_layout(Layout *l)
 	layout = l;
 }
 
-Panel::Child *Panel::create_child(Widget *wdg)
-{
-	return new Child(*this, wdg);
-}
-
-void Panel::raise(Widget &wdg)
-{
-	for(list<Container::Child *>::iterator i=children.begin(); i!=children.end(); ++i)
-		if((*i)->widget==&wdg)
-		{
-			children.splice(children.end(), children, i);
-			return;
-		}
-
-	throw hierarchy_error("widget not in panel");
-}
-
-Widget *Panel::get_final_input_focus() const
+void Panel::autosize_special(const Part &part, Geometry &ageom) const
 {
-	if(Panel *panel = dynamic_cast<Panel *>(input_focus))
-	{
-		Widget *focus = panel->get_final_input_focus();
-		if(focus)
-			return focus;
-	}
-	return input_focus;
+	if(part.get_name()=="children" && layout)
+		layout->autosize(ageom);
 }
 
-void Panel::render_special(const Part &part) const
+void Panel::render_special(const Part &part, GL::Renderer &renderer) const
 {
 	if(part.get_name()=="children")
 	{
 		for(list<Container::Child *>::const_iterator i=children.begin(); i!=children.end(); ++i)
 			if((*i)->widget->is_visible())
-				(*i)->widget->render();
+				(*i)->widget->render(renderer);
 	}
 }
 
-void Panel::button_press(int x, int y, unsigned btn)
+bool Panel::navigate(Navigation nav)
 {
-	if(pointer_grabbed)
-	{
-		const Geometry &cgeom = pointer_focus->get_geometry();
-		pointer_focus->button_press(x-cgeom.x, y-cgeom.y, btn);
-	}
-	else
+	if(Container::navigate(nav))
+		return true;
+
+	if(nav==NAV_UP || nav==NAV_DOWN || nav==NAV_LEFT || nav==NAV_RIGHT)
 	{
-		if(Widget *wdg = get_child_at(x, y))
+		int nav_x = (nav==NAV_RIGHT ? 1 : nav==NAV_LEFT ? -1 : 0);
+		int nav_y = (nav==NAV_UP ? 1 : nav==NAV_DOWN ? -1 : 0);
+
+		int origin_x, origin_y, origin_dim;
+		if(input_focus)
 		{
-			set_pointer_focus(wdg);
-			if(wdg->is_focusable())
-				set_input_focus(wdg);
+			const Geometry &fgeom = input_focus->get_geometry();
+			origin_x = fgeom.x+(nav_x*0.5+0.5)*fgeom.w;
+			origin_y = fgeom.y+(nav_y*0.5+0.5)*fgeom.h;
+			origin_dim = abs(nav_x)*fgeom.h+abs(nav_y)*fgeom.w;
+		}
+		else
+		{
+			origin_x = geom.w*(0.5-nav_x*0.5);
+			origin_y = geom.h*(0.5-nav_y*0.5);
+			origin_dim = abs(nav_x)*geom.h+abs(nav_y)*geom.w;
 		}
-		Container::button_press(x, y, btn);
-	}
-}
 
-void Panel::button_release(int x, int y, unsigned btn)
-{
-	if(pointer_grabbed)
-	{
-		const Geometry &cgeom = pointer_focus->get_geometry();
-		pointer_focus->button_release(x-cgeom.x, y-cgeom.y, btn);
+		Widget *sibling = find_next_child(origin_x, origin_y, origin_dim, nav_x, nav_y);
+		if(!sibling && input_focus)
+		{
+			const Geometry &fgeom = input_focus->get_geometry();
+			origin_x -= fgeom.w*(nav_x*0.5);
+			origin_y -= fgeom.h*(nav_y*0.5);
+			sibling = find_next_child(origin_x, origin_y, origin_dim, nav_x, nav_y);
+		}
+
+		if(sibling)
+		{
+			set_input_focus(sibling);
+			if(Panel *panel = dynamic_cast<Panel *>(sibling))
+				panel->navigate(nav);
+			return true;
+		}
 	}
-	else
-		Container::button_release(x, y, btn);
+
+	return false;
 }
 
-void Panel::pointer_motion(int x, int y)
+Widget *Panel::find_next_child(int origin_x, int origin_y, int origin_dim, int nav_x, int nav_y) const
 {
-	if(pointer_grabbed)
-	{
-		const Geometry &cgeom = pointer_focus->get_geometry();
-		pointer_focus->pointer_motion(x-cgeom.x, y-cgeom.y);
-	}
-	else
+	Widget *sibling = 0;
+	int best_score = 0;
+	for(list<Child *>::const_iterator i=children.begin(); i!=children.end(); ++i)
 	{
-		set_pointer_focus(get_child_at(x, y));
-		Container::pointer_motion(x, y);
-	}
-}
+		if((*i)->widget==input_focus || !(*i)->widget->is_focusable())
+			continue;
 
-void Panel::pointer_leave()
-{
-	Container::pointer_leave();
-	set_pointer_focus(0);
-}
+		const Geometry &cgeom = (*i)->widget->get_geometry();
+		int dx = compute_delta(cgeom.x, cgeom.w, origin_x, origin_dim, nav_x);
+		int dy = compute_delta(cgeom.y, cgeom.h, origin_y, origin_dim, nav_y);
 
-void Panel::key_press(unsigned key, unsigned mod)
-{
-	if(input_focus)
-		input_focus->key_press(key, mod);
-}
+		int score = -1;
+		if(nav_y && nav_y*dy>=0)
+			score = nav_y*dy+abs(dx)*4;
+		else if(nav_x && nav_x*dx>=0)
+			score = nav_x*dx+abs(dy)*4;
 
-void Panel::key_release(unsigned key, unsigned mod)
-{
-	if(input_focus)
-		input_focus->key_release(key, mod);
-}
+		if(score>=0 && (!sibling || score<best_score))
+		{
+			sibling = (*i)->widget;
+			best_score = score;
+		}
+	}
 
-void Panel::character(wchar_t ch)
-{
-	if(input_focus)
-		input_focus->character(ch);
+	return sibling;
 }
 
-void Panel::focus_out()
+int Panel::compute_delta(int pos, int dim, int origin_pos, int origin_dim, int nav)
 {
-	set_input_focus(0);
-	Widget::focus_out();
+	if(nav<0)
+		return pos+dim-origin_pos;
+	else if(nav>0)
+		return pos-origin_pos;
+	else if(pos+dim<origin_pos-origin_dim/2)
+		return pos+dim+origin_dim/2-origin_pos;
+	else if(pos>origin_pos+origin_dim/2)
+		return pos-origin_pos-origin_dim/2;
+	else
+		return 0;
 }
 
-void Panel::on_child_added(Widget &wdg)
+void Panel::on_geometry_change()
 {
 	if(layout)
-		layout->add_widget(wdg);
+		layout->update();
 }
 
-void Panel::on_child_removed(Widget &wdg)
+void Panel::on_child_added(Widget &wdg)
 {
 	if(layout)
-		layout->remove_widget(wdg);
-}
-
-void Panel::set_pointer_focus(Widget *wdg)
-{
-	if(wdg!=pointer_focus)
 	{
-		if(pointer_focus)
-			pointer_focus->pointer_leave();
-
-		pointer_focus = wdg;
-
-		if(pointer_focus)
-			pointer_focus->pointer_enter();
+		layout->add_widget(wdg);
+		signal_autosize_changed.emit();
 	}
 }
 
-void Panel::set_input_focus(Widget *wdg)
+void Panel::on_child_removed(Widget &wdg)
 {
-	if(wdg!=input_focus)
+	if(layout)
 	{
-		if(input_focus)
-			input_focus->focus_out();
-
-		input_focus = wdg;
-
-		if(input_focus)
-		{
-			raise(*wdg);
-			input_focus->focus_in();
-		}
+		layout->remove_widget(wdg);
+		signal_autosize_changed.emit();
 	}
 }
 
 
 Panel::Loader::Loader(Panel &p, map<string, Widget *> &m):
-	Widget::Loader(p),
-	pnl(p),
-	wdg_map(m)
+	DataFile::DerivedObjectLoader<Panel, Widget::Loader>(p),
+	wdg_map(m),
+	last_widget(0)
 {
 	add("button",    &Loader::child<Button>);
+	add("column",    &Loader::arrangement<Column>);
+	add("constraint",&Loader::constraint);
+	add("draghandle",&Loader::child<DragHandle>);
 	add("dropdown",  &Loader::child<Dropdown>);
 	add("entry",     &Loader::child<Entry>);
+	add("expand",    &Loader::expand);
+	add("ghost",     &Loader::ghost);
+	add("gravity",   &Loader::gravity);
+	add("grid",      &Loader::grid);
 	add("hslider",   &Loader::child<HSlider>);
+	add("image",     &Loader::child<Image>);
 	add("indicator", &Loader::child<Indicator>);
 	add("label",     &Loader::child<Label>);
+	add("layout",    &Loader::layout);
 	add("list",      &Loader::child<List>);
 	add("panel",     &Loader::panel);
-	add("table",     &Loader::child<Table>);
+	add("row",       &Loader::arrangement<Row>);
+	add("stack",     &Loader::arrangement<Stack>);
 	add("toggle",    &Loader::child<Toggle>);
 	add("vslider",   &Loader::child<VSlider>);
 }
 
+Layout &Panel::Loader::get_layout()
+{
+	if(!obj.layout)
+		obj.set_layout(new Layout);
+
+	return *obj.layout;
+}
+
+Widget &Panel::Loader::get_last_widget()
+{
+	if(!last_widget)
+		throw logic_error("no widget loaded");
+
+	return *last_widget;
+}
+
+template<typename T>
+void Panel::Loader::arrangement()
+{
+	T arr(get_layout());
+	ArrangedLoader<T> ldr(*this, arr);
+	load_sub_with(ldr);
+}
+
 template<typename T>
 void Panel::Loader::child(const string &n)
 {
 	RefPtr<T> chl = new T();
 	load_sub(*chl);
-	pnl.add(*chl.get());
-	wdg_map[n] = chl.release();
+	obj.add(*chl.get());
+	last_widget = wdg_map[n] = chl.release();
 }
 
-void Panel::Loader::panel(const string &n)
+void Panel::Loader::constraint(Layout::ConstraintType type, const string &n)
 {
-	RefPtr<Panel> p = new Panel();
-	load_sub(*p, wdg_map);
-	pnl.add(*p.get());
-	wdg_map[n] = p.release();
+	Widget &src = get_last_widget();
+	Widget &tgt = *get_item(wdg_map, n);
+	get_layout().add_constraint(src, type, tgt);
 }
 
-
-Panel::Child::Child(Panel &p, Widget *w):
-	Container::Child(p, w)
+void Panel::Loader::expand(bool h, bool v)
 {
-	widget->signal_visibility_changed.connect(sigc::mem_fun(this, &Child::visibility_changed));
-	widget->signal_request_focus.connect(sigc::mem_fun(this, &Child::request_focus));
-	widget->signal_grab_pointer.connect(sigc::mem_fun(this, &Child::grab_pointer));
-	widget->signal_ungrab_pointer.connect(sigc::mem_fun(this, &Child::ungrab_pointer));
+	get_layout().set_expand(get_last_widget(), h, v);
 }
 
-Panel::Child::~Child()
+void Panel::Loader::ghost(bool g)
 {
-	visibility_changed(false);
+	get_layout().set_ghost(get_last_widget(), g);
 }
 
-void Panel::Child::visibility_changed(bool v)
+void Panel::Loader::gravity(int h, int v)
 {
-	if(!v)
-	{
-		Panel &panel = static_cast<Panel &>(container);
-		if(widget==panel.pointer_focus)
-			panel.set_pointer_focus(0);
-		if(widget==panel.input_focus)
-			panel.set_input_focus(0);
-	}
+	get_layout().set_gravity(get_last_widget(), h, v);
 }
 
-void Panel::Child::autosize_changed()
+void Panel::Loader::grid(unsigned cols)
 {
-	Panel &panel = static_cast<Panel &>(container);
-	if(panel.layout)
-		panel.layout->update();
+	Grid grd(get_layout(), cols);
+	ArrangedLoader<Grid> ldr(*this, grd);
+	load_sub_with(ldr);
 }
 
-void Panel::Child::request_focus()
+void Panel::Loader::layout()
 {
-	Panel &panel = static_cast<Panel &>(container);
-	panel.set_input_focus(widget);
-	if(panel.parent && panel.visible)
-		panel.set_focus();
+	Layout::Loader ldr(get_layout(), wdg_map);
+	load_sub_with(ldr);
 }
 
-void Panel::Child::grab_pointer()
+void Panel::Loader::panel(const string &n)
 {
-	Panel &panel = static_cast<Panel &>(container);
-	if(!panel.pointer_grabbed)
-	{
-		panel.set_pointer_focus(widget);
-		panel.pointer_grabbed = true;
-		panel.signal_grab_pointer.emit();
-	}
+	RefPtr<Panel> p = new Panel();
+	load_sub(*p, wdg_map);
+	obj.add(*p.get());
+	last_widget = wdg_map[n] = p.release();
 }
 
-void Panel::Child::ungrab_pointer()
+
+template<typename T>
+Panel::ArrangedLoader<T>::ArrangedLoader(Loader &ldr, T &arr):
+	arr_loader(arr)
 {
-	Panel &panel = static_cast<Panel &>(container);
-	if(panel.pointer_grabbed && panel.pointer_focus==widget)
-	{
-		// XXX Should set to the widget under pointer
-		panel.set_pointer_focus(0);
-		panel.pointer_grabbed = false;
-		panel.signal_ungrab_pointer.emit();
-	}
+	add_auxiliary_loader(ldr);
+	add_auxiliary_loader(arr_loader);
 }
 
 } // namespace GLtk