summaryrefslogtreecommitdiff
path: root/src/lib/evas/canvas/evas_callbacks.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/evas/canvas/evas_callbacks.c')
-rw-r--r--src/lib/evas/canvas/evas_callbacks.c19
1 files changed, 3 insertions, 16 deletions
diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c
index 65b78f2..d9aac15 100644
--- a/src/lib/evas/canvas/evas_callbacks.c
+++ b/src/lib/evas/canvas/evas_callbacks.c
@@ -2,9 +2,6 @@
2#include "evas_common_private.h" 2#include "evas_common_private.h"
3#include "evas_private.h" 3#include "evas_private.h"
4 4
5#define EFL_INTERNAL_UNSTABLE
6#include "interfaces/efl_common_internal.h"
7
8EVAS_MEMPOOL(_mp_pc); 5EVAS_MEMPOOL(_mp_pc);
9 6
10extern Eina_Hash* signals_hash_table; 7extern Eina_Hash* signals_hash_table;
@@ -396,7 +393,7 @@ evas_object_event_callback_call(Evas_Object *eo_obj, Evas_Object_Protected_Data
396 type == EVAS_CALLBACK_MULTI_DOWN || 393 type == EVAS_CALLBACK_MULTI_DOWN ||
397 type == EVAS_CALLBACK_MOUSE_UP || 394 type == EVAS_CALLBACK_MOUSE_UP ||
398 type == EVAS_CALLBACK_MULTI_UP) 395 type == EVAS_CALLBACK_MULTI_UP)
399 _efl_canvas_gesture_manager_filter_event(e->gesture_manager, eo_obj, event_info); 396 _efl_canvas_gesture_manager_filter_event(e->gmd, eo_obj, event_info);
400 397
401 if (obj->is_smart) 398 if (obj->is_smart)
402 _evas_object_smart_callback_call_internal(eo_obj, efl_event_desc); 399 _evas_object_smart_callback_call_internal(eo_obj, efl_event_desc);
@@ -820,17 +817,12 @@ void
820evas_object_callbacks_event_catcher_add(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, const Efl_Callback_Array_Item *array) 817evas_object_callbacks_event_catcher_add(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, const Efl_Callback_Array_Item *array)
821{ 818{
822 Evas_Callback_Type type = EVAS_CALLBACK_LAST; 819 Evas_Callback_Type type = EVAS_CALLBACK_LAST;
823 void *gd = NULL;
824 int i; 820 int i;
825 821
826 for (i = 0; array[i].desc != NULL; i++) 822 for (i = 0; array[i].desc != NULL; i++)
827 { 823 {
828 if (obj->layer && obj->layer->evas && obj->layer->evas->gesture_manager) 824 if (obj->layer && obj->layer->evas && obj->layer->evas->gesture_manager)
829 { 825 _efl_canvas_gesture_manager_callback_add_hook(obj->layer->evas->gmd, obj->object, array[i].desc);
830 if (!gd) gd = _efl_canvas_gesture_manager_private_data_get(obj->layer->evas->gesture_manager);
831
832 _efl_canvas_gesture_manager_callback_add_hook(gd, obj->object, array[i].desc);
833 }
834 826
835 if (array[i].desc == EFL_CANVAS_OBJECT_EVENT_ANIMATOR_TICK) 827 if (array[i].desc == EFL_CANVAS_OBJECT_EVENT_ANIMATOR_TICK)
836 { 828 {
@@ -858,7 +850,6 @@ evas_object_callbacks_event_catcher_add(Eo *eo_obj EINA_UNUSED, Evas_Object_Prot
858void 850void
859evas_object_callbacks_event_catcher_del(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, const Efl_Callback_Array_Item *array) 851evas_object_callbacks_event_catcher_del(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, const Efl_Callback_Array_Item *array)
860{ 852{
861 void *gd = NULL;
862 int i; 853 int i;
863 854
864 if (!obj->layer || 855 if (!obj->layer ||
@@ -868,11 +859,7 @@ evas_object_callbacks_event_catcher_del(Eo *eo_obj EINA_UNUSED, Evas_Object_Prot
868 for (i = 0; array[i].desc != NULL; i++) 859 for (i = 0; array[i].desc != NULL; i++)
869 { 860 {
870 if (obj->layer->evas->gesture_manager) 861 if (obj->layer->evas->gesture_manager)
871 { 862 _efl_canvas_gesture_manager_callback_del_hook(obj->layer->evas->gmd, obj->object, array[i].desc);
872 if (!gd) gd = _efl_canvas_gesture_manager_private_data_get(obj->layer->evas->gesture_manager);
873
874 _efl_canvas_gesture_manager_callback_del_hook(gd, obj->object, array[i].desc);
875 }
876 863
877 if (array[i].desc == EFL_CANVAS_OBJECT_EVENT_ANIMATOR_TICK) 864 if (array[i].desc == EFL_CANVAS_OBJECT_EVENT_ANIMATOR_TICK)
878 { 865 {