Add an event handler to allow containers to reach to focus changes

[libs/gltk.git] / source / container.cpp

diff --git a/source/container.cpp b/source/container.cpp
index c38509fd931fe37ca756818dbb575b5c3d20b210..23227331139edab708849e8a63379d78ef5835d1 100644 (file)
--- 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;
                }
@@ -147,12 +151,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 +167,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))
@@ -274,7 +290,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 +298,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 +306,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,12 +320,30 @@ void Container::focus_out()
 
 bool Container::navigate(Navigation nav)
 {
-       if(input_focus)
+       if(input_focus && input_focus->is_enabled())
                return input_focus->navigate(nav);
        else
                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)
@@ -320,6 +354,12 @@ void Container::on_reparent()
        }
 }
 
+void Container::on_input_focus_changed(Widget *wdg)
+{
+       if(wdg)
+               raise(*wdg);
+}
+
 
 Container::Child::Child(Container &c, Widget *w):
        container(c),
@@ -329,6 +369,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()
@@ -351,9 +392,10 @@ 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()
@@ -377,5 +419,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