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

diff --git a/source/container.cpp b/source/container.cpp
index 91fa487..62e6e12 100644
--- a/source/container.cpp
+++ b/source/container.cpp
@@ -30,6 +30,8 @@ void Container::add(Widget &wdg)
 {
 	wdg.set_parent(this);
 	children.push_back(create_child(&wdg));
+	if(wdg.get_animation_interval())
+		check_animation_interval();
 	on_child_added(wdg);
 }
 
@@ -41,6 +43,8 @@ void Container::remove(Widget &wdg)
 			wdg.set_parent(0);
 			delete *i;
 			children.erase(i);
+			if(wdg.get_animation_interval())
+				check_animation_interval();
 			on_child_removed(wdg);
 			return;
 		}
@@ -165,6 +169,20 @@ Widget *Container::get_final_input_focus() const
 	return input_focus;
 }
 
+void Container::check_animation_interval()
+{
+	Time::TimeDelta shortest;
+	for(list<Child *>::const_iterator i=children.begin(); i!=children.end(); ++i)
+	{
+		const Time::TimeDelta &child_iv = (*i)->widget->get_animation_interval();
+		if(child_iv && (!shortest || child_iv<shortest))
+			shortest = child_iv;
+	}
+
+	if(shortest!=anim_interval)
+		set_animation_interval(shortest);
+}
+
 void Container::button_press(int x, int y, unsigned btn)
 {
 	if(Widget *child = get_pointer_target(x, y, false))
@@ -310,6 +328,24 @@ bool Container::navigate(Navigation nav)
 		return false;
 }
 
+void Container::animate(const Time::TimeDelta &dt)
+{
+	for(list<Child *>::iterator i=children.begin(); i!=children.end(); ++i)
+	{
+		const Time::TimeDelta &child_iv = (*i)->widget->get_animation_interval();
+		if(!child_iv)
+			continue;
+
+		(*i)->time_since_animate += dt;
+		if((*i)->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);
+		}
+	}
+}
+
 void Container::on_reparent()
 {
 	for(list<Child *>::iterator i=children.begin(); i!=children.end(); ++i)
@@ -329,6 +365,7 @@ 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));
 }
 
 Container::Child::~Child()
@@ -377,5 +414,12 @@ void Container::Child::ungrab_pointer()
 	}
 }
 
+void Container::Child::request_animation(const Time::TimeDelta &interval)
+{
+	if(!interval)
+		time_since_animate = Time::zero;
+	container.check_animation_interval();
+}
+
 } // namespace GLtk
 } // namespace Msp