Emit rebuild_needed from a container when a child is added

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

diff --git a/source/container.cpp b/source/container.cpp
index 91fa48758c8a60ec90cba48331798b3201906ae1..6e1a3562f5280a853d1996f6b99e973f0a0d25eb 100644 (file)
--- a/source/container.cpp
+++ b/source/container.cpp
@@ -17,7 +17,9 @@ Container::Container():
        pointer_focus(0),
        pointer_grabbed(false),
        input_focus(0),
-       touch_focus(0)
+       saved_input_focus(0),
+       touch_focus(0),
+       children_rebuild_needed(false)
 { }
 
 Container::~Container()
@@ -30,6 +32,10 @@ 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);
 }
 
@@ -41,6 +47,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;
                }
@@ -125,7 +133,7 @@ void Container::raise(Widget &wdg)
        throw hierarchy_error("widget not in container");
 }
 
-void Container::set_pointer_focus(Widget *wdg)
+void Container::set_pointer_focus(Widget *wdg, bool grab)
 {
        if(wdg!=pointer_focus)
        {
@@ -133,10 +141,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 +158,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 +174,32 @@ 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::rebuild_hierarchy()
+{
+       Widget::rebuild_hierarchy();
+
+       if(children_rebuild_needed)
+       {
+               children_rebuild_needed = false;
+               for(list<Child *>::iterator i=children.begin(); i!=children.end(); ++i)
+                       (*i)->widget->rebuild_hierarchy();
+       }
+}
+
 void Container::button_press(int x, int y, unsigned btn)
 {
        if(Widget *child = get_pointer_target(x, y, false))
@@ -204,7 +239,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)
        {
@@ -296,8 +331,16 @@ 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()
 {
+       saved_input_focus = input_focus;
        set_input_focus(0);
        Widget::focus_out();
 }
@@ -310,6 +353,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)
@@ -320,6 +381,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 +396,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()
@@ -351,17 +420,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();
        }
 }
@@ -372,10 +441,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