aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/libraries/evas/src/lib/canvas/evas_events.c
diff options
context:
space:
mode:
Diffstat (limited to 'libraries/evas/src/lib/canvas/evas_events.c')
-rw-r--r--libraries/evas/src/lib/canvas/evas_events.c17
1 files changed, 3 insertions, 14 deletions
diff --git a/libraries/evas/src/lib/canvas/evas_events.c b/libraries/evas/src/lib/canvas/evas_events.c
index 9b7077e..1ee8388 100644
--- a/libraries/evas/src/lib/canvas/evas_events.c
+++ b/libraries/evas/src/lib/canvas/evas_events.c
@@ -486,8 +486,9 @@ evas_event_feed_mouse_up(Evas *e, int b, Evas_Button_Flags flags, unsigned int t
486 } 486 }
487 if (!obj->delete_me) 487 if (!obj->delete_me)
488 { 488 {
489 if (e->events_frozen <= 0) 489 if ((e->events_frozen <= 0) &&
490 evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_UP, &ev, event_id); 490 (!evas_event_freezes_through(obj)))
491 evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_UP, &ev, event_id);
491 } 492 }
492 if (e->delete_me) break; 493 if (e->delete_me) break;
493 if (obj->pointer_mode == EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN) 494 if (obj->pointer_mode == EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN)
@@ -1668,18 +1669,6 @@ evas_object_freeze_events_set(Evas_Object *obj, Eina_Bool freeze)
1668 if (obj->freeze_events == freeze) return; 1669 if (obj->freeze_events == freeze) return;
1669 obj->freeze_events = freeze; 1670 obj->freeze_events = freeze;
1670 evas_object_smart_member_cache_invalidate(obj, EINA_FALSE, EINA_TRUE); 1671 evas_object_smart_member_cache_invalidate(obj, EINA_FALSE, EINA_TRUE);
1671 if (evas_object_is_in_output_rect(obj,
1672 obj->layer->evas->pointer.x,
1673 obj->layer->evas->pointer.y, 1, 1) &&
1674 ((!obj->precise_is_inside) ||
1675 (evas_object_is_inside(obj,
1676 obj->layer->evas->pointer.x,
1677 obj->layer->evas->pointer.y))))
1678 evas_event_feed_mouse_move(obj->layer->evas,
1679 obj->layer->evas->pointer.x,
1680 obj->layer->evas->pointer.y,
1681 obj->layer->evas->last_timestamp,
1682 NULL);
1683} 1672}
1684 1673
1685EAPI Eina_Bool 1674EAPI Eina_Bool