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

diff --git a/source/container.cpp b/source/container.cpp
index b50bc29..ef837a2 100644
--- a/source/container.cpp
+++ b/source/container.cpp
@@ -1,3 +1,4 @@
+#include <msp/core/algorithm.h>
 #include "container.h"
 #include "part.h"
 
@@ -11,15 +12,6 @@ hierarchy_error::hierarchy_error(const string &w):
 { }
 
 
-Container::Container():
-	click_focus(0),
-	click_button(0),
-	pointer_focus(0),
-	pointer_grabbed(false),
-	input_focus(0),
-	touch_focus(0)
-{ }
-
 Container::~Container()
 {
 	while(!children.empty())
@@ -30,22 +22,25 @@ void Container::add(Widget &wdg)
 {
 	wdg.set_parent(this);
 	children.push_back(create_child(&wdg));
+	if(wdg.get_animation_interval())
+		check_animation_interval();
+	children_rebuild_needed = true;
+	signal_rebuild_needed.emit();
 	on_child_added(wdg);
 }
 
 void Container::remove(Widget &wdg)
 {
-	for(list<Child *>::iterator i=children.begin(); i!=children.end(); ++i)
-		if((*i)->widget==&wdg)
-		{
-			wdg.set_parent(0);
-			delete *i;
-			children.erase(i);
-			on_child_removed(wdg);
-			return;
-		}
+	auto i = find_if(children, [&wdg](const Child *c){ return c->widget==&wdg; });
+	if(i==children.end())
+		throw hierarchy_error("widget not in container");
 
-	throw hierarchy_error("widget not in container");
+	wdg.set_parent(0);
+	delete *i;
+	children.erase(i);
+	if(wdg.get_animation_interval())
+		check_animation_interval();
+	on_child_removed(wdg);
 }
 
 Container::Child *Container::create_child(Widget *wdg)
@@ -86,14 +81,14 @@ void Container::reposition_child(Widget &child, const Part &part) const
 list<Widget *> Container::get_children() const
 {
 	list<Widget *> result;
-	for(list<Child *>::const_iterator i=children.begin(); i!=children.end(); ++i)
-		result.push_back((*i)->widget);
+	for(const Child *c: children)
+		result.push_back(c->widget);
 	return result;
 }
 
 Widget *Container::get_child_at(int x, int y) const
 {
-	for(list<Child *>::const_iterator i=children.end(); i!=children.begin();)
+	for(auto i=children.end(); i!=children.begin();)
 		if((*--i)->widget->is_visible() && (*i)->widget->get_geometry().is_inside(x, y))
 			return (*i)->widget;
 
@@ -115,17 +110,14 @@ Widget *Container::get_descendant_at(int x, int y) const
 
 void Container::raise(Widget &wdg)
 {
-	for(list<Child *>::iterator i=children.begin(); i!=children.end(); ++i)
-		if((*i)->widget==&wdg)
-		{
-			children.splice(children.end(), children, i);
-			return;
-		}
+	auto i = find_if(children, [&wdg](const Child *c){ return c->widget==&wdg; });
+	if(i==children.end())
+		throw hierarchy_error("widget not in container");
 
-	throw hierarchy_error("widget not in container");
+	children.splice(children.end(), children, i);
 }
 
-void Container::set_pointer_focus(Widget *wdg)
+void Container::set_pointer_focus(Widget *wdg, bool grab)
 {
 	if(wdg!=pointer_focus)
 	{
@@ -133,10 +125,13 @@ void Container::set_pointer_focus(Widget *wdg)
 			pointer_focus->pointer_leave();
 
 		pointer_focus = wdg;
+		pointer_grabbed = grab;
 
 		if(pointer_focus)
 			pointer_focus->pointer_enter();
 	}
+	else
+		pointer_grabbed = grab;
 }
 
 void Container::set_input_focus(Widget *wdg)
@@ -147,12 +142,10 @@ void Container::set_input_focus(Widget *wdg)
 			input_focus->focus_out();
 
 		input_focus = wdg;
+		on_input_focus_changed(input_focus);
 
 		if(input_focus)
-		{
-			raise(*wdg);
 			input_focus->focus_in();
-		}
 	}
 }
 
@@ -165,6 +158,32 @@ Widget *Container::get_final_input_focus() const
 	return input_focus;
 }
 
+void Container::check_animation_interval()
+{
+	Time::TimeDelta shortest;
+	for(const Child *c: children)
+	{
+		const Time::TimeDelta &child_iv = c->widget->get_animation_interval();
+		if(child_iv && (!shortest || child_iv<shortest))
+			shortest = child_iv;
+	}
+
+	if(shortest!=anim_interval)
+		set_animation_interval(shortest);
+}
+
+void Container::rebuild_hierarchy()
+{
+	Widget::rebuild_hierarchy();
+
+	if(children_rebuild_needed)
+	{
+		children_rebuild_needed = false;
+		for(Child *c: children)
+			c->widget->rebuild_hierarchy();
+	}
+}
+
 void Container::button_press(int x, int y, unsigned btn)
 {
 	if(Widget *child = get_pointer_target(x, y, false))
@@ -204,7 +223,7 @@ void Container::pointer_motion(int x, int y)
 {
 	Widget *child = get_pointer_target(x, y, false);
 	if(!pointer_grabbed)
-		set_pointer_focus((!click_focus || child->get_geometry().is_inside(x, y)) ? child : 0);
+		set_pointer_focus((child && child->get_geometry().is_inside(x, y)) ? child : 0);
 
 	if(child)
 	{
@@ -274,7 +293,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 +301,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,92 +309,68 @@ 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;
 }
 
+void Container::focus_in()
+{
+	if(saved_input_focus && saved_input_focus->get_parent()==this)
+		set_input_focus(saved_input_focus);
+	Widget::focus_in();
+}
+
 void Container::focus_out()
 {
+	saved_input_focus = input_focus;
 	set_input_focus(0);
 	Widget::focus_out();
 }
 
 bool Container::navigate(Navigation nav)
 {
-	if(input_focus && input_focus->navigate(nav))
-		return true;
+	if(input_focus && input_focus->is_enabled())
+		return input_focus->navigate(nav);
+	else
+		return false;
+}
 
-	if(nav==NAV_UP || nav==NAV_DOWN || nav==NAV_LEFT || nav==NAV_RIGHT)
+void Container::animate(const Time::TimeDelta &dt)
+{
+	for(Child *c: children)
 	{
-		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;
-			}
-		}
+		const Time::TimeDelta &child_iv = c->widget->get_animation_interval();
+		if(!child_iv)
+			continue;
 
-		if(sibling)
+		c->time_since_animate += dt;
+		if(c->time_since_animate>=child_iv)
 		{
-			set_input_focus(sibling);
-			if(Container *container = dynamic_cast<Container *>(sibling))
-				container->navigate(nav);
-			return true;
+			Time::TimeDelta child_dt = c->time_since_animate;
+			c->time_since_animate = min(c->time_since_animate-child_iv, child_iv);
+			c->widget->animate(child_dt);
 		}
 	}
-
-	return false;
 }
 
 void Container::on_reparent()
 {
-	for(list<Child *>::iterator i=children.begin(); i!=children.end(); ++i)
+	for(const Child *c: children)
 	{
-		if(Container *c = dynamic_cast<Container *>((*i)->widget))
-			c->on_reparent();
-		(*i)->widget->update_style();
+		if(Container *o = dynamic_cast<Container *>(c->widget))
+			o->on_reparent();
+		c->widget->update_style();
 	}
 }
 
+void Container::on_input_focus_changed(Widget *wdg)
+{
+	if(wdg)
+		raise(*wdg);
+}
+
 
 Container::Child::Child(Container &c, Widget *w):
 	container(c),
@@ -385,6 +380,8 @@ Container::Child::Child(Container &c, Widget *w):
 	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));
+	widget->signal_request_animation.connect(sigc::mem_fun(this, &Child::request_animation));
+	widget->signal_rebuild_needed.connect(sigc::mem_fun(this, &Child::rebuild_needed));
 }
 
 Container::Child::~Child()
@@ -407,17 +404,17 @@ void Container::Child::visibility_changed(bool v)
 
 void Container::Child::request_focus()
 {
-	container.set_input_focus(widget);
 	if(container.parent && container.visible)
 		container.set_focus();
+	if(container.state&FOCUS)
+		container.set_input_focus(widget);
 }
 
 void Container::Child::grab_pointer()
 {
 	if(!container.pointer_grabbed)
 	{
-		container.set_pointer_focus(widget);
-		container.pointer_grabbed = true;
+		container.set_pointer_focus(widget, true);
 		container.signal_grab_pointer.emit();
 	}
 }
@@ -428,10 +425,22 @@ void Container::Child::ungrab_pointer()
 	{
 		// XXX Should set to the widget under pointer
 		container.set_pointer_focus(0);
-		container.pointer_grabbed = false;
 		container.signal_ungrab_pointer.emit();
 	}
 }
 
+void Container::Child::request_animation(const Time::TimeDelta &interval)
+{
+	if(!interval)
+		time_since_animate = Time::zero;
+	container.check_animation_interval();
+}
+
+void Container::Child::rebuild_needed()
+{
+	container.children_rebuild_needed = true;
+	container.signal_rebuild_needed.emit();
+}
+
 } // namespace GLtk
 } // namespace Msp