X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpanel.cpp;h=7e34c5947a7c7f4e0f93822eac08707c0ba3f104;hb=ae62c05fe97d341c4f219656cdce7aadf321991b;hp=836d991eb73e3b226d859b5c2c4a2da7acf5037a;hpb=31e9ee682f8a9cd77c97ed9dc142283559ddaacc;p=libs%2Fgltk.git

diff --git a/source/panel.cpp b/source/panel.cpp
index 836d991..7e34c59 100644
--- a/source/panel.cpp
+++ b/source/panel.cpp
@@ -8,6 +8,7 @@
 #include "entry.h"
 #include "grid.h"
 #include "hslider.h"
+#include "image.h"
 #include "indicator.h"
 #include "label.h"
 #include "list.h"
@@ -25,7 +26,9 @@ namespace GLtk {
 
 Panel::Panel():
 	layout(0)
-{ }
+{
+	input_type = INPUT_NAVIGATION;
+}
 
 Panel::~Panel()
 {
@@ -40,7 +43,7 @@ void Panel::set_layout(Layout *l)
 	layout = l;
 }
 
-void Panel::autosize_special(const Part &part, Geometry &ageom)
+void Panel::autosize_special(const Part &part, Geometry &ageom) const
 {
 	if(part.get_name()=="children" && layout)
 		layout->autosize(ageom);
@@ -56,6 +59,70 @@ void Panel::render_special(const Part &part, GL::Renderer &renderer) const
 	}
 }
 
+bool Panel::navigate(Navigation nav)
+{
+	if(Container::navigate(nav))
+		return true;
+
+	if(nav==NAV_UP || nav==NAV_DOWN || nav==NAV_LEFT || nav==NAV_RIGHT)
+	{
+		int x = geom.w/2;
+		int y = geom.h/2;
+		if(input_focus)
+		{
+			const Geometry &fgeom = input_focus->get_geometry();
+			x = fgeom.x+fgeom.w/2;
+			y = fgeom.y+fgeom.h/2;
+		}
+		else if(nav==NAV_UP)
+			y = 0;
+		else if(nav==NAV_DOWN)
+			y = geom.h;
+		else if(nav==NAV_RIGHT)
+			x = 0;
+		else if(nav==NAV_LEFT)
+			x = geom.w;
+
+		Widget *sibling = 0;
+		int best_score = 0;
+		for(list<Child *>::const_iterator i=children.begin(); i!=children.end(); ++i)
+		{
+			if((*i)->widget==input_focus || !(*i)->widget->is_focusable())
+				continue;
+
+			const Geometry &cgeom = (*i)->widget->get_geometry();
+			int dx = cgeom.x+cgeom.w/2-x;
+			int dy = cgeom.y+cgeom.h/2-y;
+
+			int score = -1;
+			if(nav==NAV_UP && dy>0)
+				score = dy+abs(dx)*4;
+			else if(nav==NAV_DOWN && dy<0)
+				score = -dy+abs(dx)*4;
+			else if(nav==NAV_RIGHT && dx>0)
+				score = dx+abs(dy)*4;
+			else if(nav==NAV_LEFT && dx<0)
+				score = -dx+abs(dy)*4;
+
+			if(score>0 && (!sibling || score<best_score))
+			{
+				sibling = (*i)->widget;
+				best_score = score;
+			}
+		}
+
+		if(sibling)
+		{
+			set_input_focus(sibling);
+			if(Panel *panel = dynamic_cast<Panel *>(sibling))
+				panel->navigate(nav);
+			return true;
+		}
+	}
+
+	return false;
+}
+
 void Panel::on_geometry_change()
 {
 	if(layout)
@@ -97,6 +164,7 @@ Panel::Loader::Loader(Panel &p, map<string, Widget *> &m):
 	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);