X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcontainer.cpp;h=91fa48758c8a60ec90cba48331798b3201906ae1;hb=7a479bd688449ec150196f033855af7713fddc0e;hp=b50bc29e2f9c120c5fee986fa319cafde6d8c459;hpb=1597579a34a8d87d4dea0a0cdc0895e6247b6126;p=libs%2Fgltk.git

diff --git a/source/container.cpp b/source/container.cpp
index b50bc29..91fa487 100644
--- a/source/container.cpp
+++ b/source/container.cpp
@@ -274,7 +274,7 @@ void Container::touch_motion(int x, int y, unsigned finger)
 
 bool Container::key_press(unsigned key, unsigned mod)
 {
-	if(input_focus)
+	if(input_focus && input_focus->is_enabled())
 		return input_focus->key_press(key, mod);
 	else
 		return false;
@@ -282,7 +282,7 @@ bool Container::key_press(unsigned key, unsigned mod)
 
 bool Container::key_release(unsigned key, unsigned mod)
 {
-	if(input_focus)
+	if(input_focus && input_focus->is_enabled())
 		return input_focus->key_release(key, mod);
 	else
 		return false;
@@ -290,7 +290,7 @@ bool Container::key_release(unsigned key, unsigned mod)
 
 bool Container::character(wchar_t ch)
 {
-	if(input_focus)
+	if(input_focus && input_focus->is_enabled())
 		return input_focus->character(ch);
 	else
 		return false;
@@ -304,66 +304,10 @@ void Container::focus_out()
 
 bool Container::navigate(Navigation nav)
 {
-	if(input_focus && input_focus->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(Container *container = dynamic_cast<Container *>(sibling))
-				container->navigate(nav);
-			return true;
-		}
-	}
-
-	return false;
+	if(input_focus && input_focus->is_enabled())
+		return input_focus->navigate(nav);
+	else
+		return false;
 }
 
 void Container::on_reparent()