Fix bug in in mouse grabs while frozen events are in place.

SVN revision: 61070
This commit is contained in:
Carsten Haitzler 2011-07-06 08:43:18 +00:00
parent a51b5660a2
commit 90d7dbddd4
2 changed files with 9 additions and 0 deletions

View File

@ -418,3 +418,7 @@
* Fix bug where event causes event in callback on same object, but
with same event counter, so also filter out same event types.
2011-07-06 Carsten Haitzler (The Rasterman)
* Fix bug in grab counting on object hide while events are frozen

View File

@ -947,6 +947,11 @@ evas_object_hide(Evas_Object *obj)
}
else
{
if (obj->mouse_grabbed > 0)
{
// if (obj->layer->evas->pointer.mouse_grabbed >= obj->mouse_grabbed)
obj->layer->evas->pointer.mouse_grabbed -= obj->mouse_grabbed;
}
if ((obj->mouse_in) || (obj->mouse_grabbed > 0))
obj->layer->evas->pointer.object.in = eina_list_remove(obj->layer->evas->pointer.object.in, obj);
obj->mouse_grabbed = 0;