Adjust a pointer check in Container

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

diff --git a/source/container.cpp b/source/container.cpp
index 62e6e125429bb7a10ca10b33476bc5d36fbd1a92..e99d9939aefdf0b951feba1572804d95e38bd5cf 100644 (file)
--- a/source/container.cpp
+++ b/source/container.cpp
@@ -17,6 +17,7 @@ Container::Container():
        pointer_focus(0),
        pointer_grabbed(false),
        input_focus(0),
+       saved_input_focus(0),
        touch_focus(0)
 { }
 
@@ -129,7 +130,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)
        {
@@ -137,10 +138,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)
@@ -151,12 +155,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();
-               }
        }
 }
 
@@ -222,7 +224,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)
        {
@@ -314,8 +316,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();
 }
@@ -356,6 +366,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),
@@ -388,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();
        }
 }
@@ -409,7 +425,6 @@ 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();
        }
 }