fix over/under grab problems

SVN revision: 22234
This commit is contained in:
Carsten Haitzler 2006-04-19 14:37:49 +00:00
parent a7a53674ef
commit 05ea1163f3
2 changed files with 6 additions and 4 deletions

View File

@ -297,8 +297,10 @@ evas_event_feed_mouse_up(Evas *e, int b, Evas_Button_Flags flags, unsigned int t
Evas_Event_Mouse_Up ev;
obj = l->data;
if (obj->mouse_grabbed > 0) obj->mouse_grabbed--;
if (e->pointer.mouse_grabbed > 0) e->pointer.mouse_grabbed--;
// if (obj->mouse_grabbed > 0)
obj->mouse_grabbed--;
// if (e->pointer.mouse_grabbed > 0)
e->pointer.mouse_grabbed--;
ev.button = b;
ev.output.x = e->pointer.x;
ev.output.y = e->pointer.y;
@ -460,7 +462,7 @@ evas_event_feed_mouse_move(Evas *e, int x, int y, unsigned int timestamp, const
e->pointer.canvas_y = evas_coord_screen_y_to_world(e, y);
if ((!e->pointer.inside) && (e->pointer.mouse_grabbed == 0)) return;
/* if our mouse button is grabbed to any objects */
if (e->pointer.mouse_grabbed != 0)
if (e->pointer.mouse_grabbed > 0)
{
/* go thru old list of in objects */
Evas_List *outs = NULL;

View File

@ -698,7 +698,7 @@ evas_object_hide(Evas_Object *obj)
if (obj->delete_me) return;
if (obj->mouse_grabbed > 0)
{
if (obj->layer->evas->pointer.mouse_grabbed >= obj->mouse_grabbed)
// if (obj->layer->evas->pointer.mouse_grabbed >= obj->mouse_grabbed)
obj->layer->evas->pointer.mouse_grabbed -= obj->mouse_grabbed;
}
{