X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcontainer.cpp;h=e99d9939aefdf0b951feba1572804d95e38bd5cf;hb=ecc3ffc4433f14534560bbe51441e7f02e42a0c1;hp=03dff1137bfdf6416f6d755c61bae65604f8733b;hpb=5bb0cc92a28a7862571249a2512bcd23ed272344;p=libs%2Fgltk.git

diff --git a/source/container.cpp b/source/container.cpp
index 03dff11..e99d993 100644
--- a/source/container.cpp
+++ b/source/container.cpp
@@ -130,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)
 	{
@@ -138,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)
@@ -221,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)
 	{
@@ -411,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();
 	}
 }
@@ -423,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();
 	}
 }