X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcontainer.cpp;h=393973cc2ab7293adcd32c3e939442780e0ff23e;hb=9678abb23abe450109e2feda081f5bba5f20cc94;hp=23227331139edab708849e8a63379d78ef5835d1;hpb=2b3940dd34611a6f669278de9a5146b6e85f6119;p=libs%2Fgltk.git

diff --git a/source/container.cpp b/source/container.cpp
index 2322733..393973c 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())
@@ -32,24 +24,23 @@ void Container::add(Widget &wdg)
 	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);
-			if(wdg.get_animation_interval())
-				check_animation_interval();
-			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(nullptr);
+	delete *i;
+	children.erase(i);
+	if(wdg.get_animation_interval())
+		check_animation_interval();
+	on_child_removed(wdg);
 }
 
 Container::Child *Container::create_child(Widget *wdg)
@@ -90,27 +81,27 @@ 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
+Widget *Container::find_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;
 
-	return 0;
+	return nullptr;
 }
 
-Widget *Container::get_descendant_at(int x, int y) const
+Widget *Container::find_descendant_at(int x, int y) const
 {
-	Widget *wdg = get_child_at(x, y);
+	Widget *wdg = find_child_at(x, y);
 	if(Container *cont = dynamic_cast<Container *>(wdg))
 	{
 		const Geometry &cgeom = wdg->get_geometry();
-		Widget *wdg2 = cont->get_descendant_at(x-cgeom.x, y-cgeom.y);
+		Widget *wdg2 = cont->find_descendant_at(x-cgeom.x, y-cgeom.y);
 		if(wdg2)
 			return wdg2;
 	}
@@ -119,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)
 	{
@@ -137,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)
@@ -170,9 +161,9 @@ Widget *Container::get_final_input_focus() const
 void Container::check_animation_interval()
 {
 	Time::TimeDelta shortest;
-	for(list<Child *>::const_iterator i=children.begin(); i!=children.end(); ++i)
+	for(const Child *c: children)
 	{
-		const Time::TimeDelta &child_iv = (*i)->widget->get_animation_interval();
+		const Time::TimeDelta &child_iv = c->widget->get_animation_interval();
 		if(child_iv && (!shortest || child_iv<shortest))
 			shortest = child_iv;
 	}
@@ -181,6 +172,18 @@ void Container::check_animation_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))
@@ -206,9 +209,9 @@ void Container::button_release(int x, int y, unsigned btn)
 	{
 		if(child==click_focus && btn==click_button)
 		{
-			click_focus = 0;
+			click_focus = nullptr;
 			if(!pointer_focus)
-				set_pointer_focus(get_child_at(x, y));
+				set_pointer_focus(find_child_at(x, y));
 		}
 
 		const Geometry &cgeom = child->get_geometry();
@@ -220,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 : nullptr);
 
 	if(child)
 	{
@@ -239,18 +242,18 @@ Widget *Container::get_pointer_target(int x, int y, bool touch) const
 		return touch_focus;
 	else
 	{
-		Widget *child = get_child_at(x, y);
+		Widget *child = find_child_at(x, y);
 		if(child && child->is_enabled())
 			return child;
 		else
-			return 0;
+			return nullptr;
 	}
 }
 
 void Container::pointer_leave()
 {
 	Widget::pointer_leave();
-	set_pointer_focus(0);
+	set_pointer_focus(nullptr);
 }
 
 void Container::touch_press(int x, int y, unsigned finger)
@@ -272,7 +275,7 @@ void Container::touch_release(int x, int y, unsigned finger)
 	{
 		// TODO track focus for each finger separately
 		if(child==touch_focus)
-			touch_focus = 0;
+			touch_focus = nullptr;
 
 		const Geometry &cgeom = child->get_geometry();
 		child->touch_release(x-cgeom.x, y-cgeom.y, finger);
@@ -312,9 +315,17 @@ bool Container::character(wchar_t ch)
 		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()
 {
-	set_input_focus(0);
+	saved_input_focus = input_focus;
+	set_input_focus(nullptr);
 	Widget::focus_out();
 }
 
@@ -328,29 +339,29 @@ bool Container::navigate(Navigation nav)
 
 void Container::animate(const Time::TimeDelta &dt)
 {
-	for(list<Child *>::iterator i=children.begin(); i!=children.end(); ++i)
+	for(Child *c: children)
 	{
-		const Time::TimeDelta &child_iv = (*i)->widget->get_animation_interval();
+		const Time::TimeDelta &child_iv = c->widget->get_animation_interval();
 		if(!child_iv)
 			continue;
 
-		(*i)->time_since_animate += dt;
-		if((*i)->time_since_animate>=child_iv)
+		c->time_since_animate += dt;
+		if(c->time_since_animate>=child_iv)
 		{
-			Time::TimeDelta child_dt = (*i)->time_since_animate;
-			(*i)->time_since_animate = min((*i)->time_since_animate-child_iv, child_iv);
-			(*i)->widget->animate(child_dt);
+			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);
 		}
 	}
 }
 
 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();
 	}
 }
 
@@ -370,6 +381,7 @@ Container::Child::Child(Container &c, Widget *w):
 	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()
@@ -382,11 +394,11 @@ void Container::Child::visibility_changed(bool v)
 	if(!v)
 	{
 		if(widget==container.click_focus)
-			container.click_focus = 0;
+			container.click_focus = nullptr;
 		if(widget==container.pointer_focus)
-			container.set_pointer_focus(0);
+			container.set_pointer_focus(nullptr);
 		if(widget==container.input_focus)
-			container.set_input_focus(0);
+			container.set_input_focus(nullptr);
 	}
 }
 
@@ -402,8 +414,7 @@ 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();
 	}
 }
@@ -413,8 +424,7 @@ void Container::Child::ungrab_pointer()
 	if(container.pointer_grabbed && container.pointer_focus==widget)
 	{
 		// XXX Should set to the widget under pointer
-		container.set_pointer_focus(0);
-		container.pointer_grabbed = false;
+		container.set_pointer_focus(nullptr);
 		container.signal_ungrab_pointer.emit();
 	}
 }
@@ -426,5 +436,11 @@ void Container::Child::request_animation(const Time::TimeDelta &interval)
 	container.check_animation_interval();
 }
 
+void Container::Child::rebuild_needed()
+{
+	container.children_rebuild_needed = true;
+	container.signal_rebuild_needed.emit();
+}
+
 } // namespace GLtk
 } // namespace Msp