summaryrefslogtreecommitdiff
path: root/src/lib/evas/canvas/evas_main.c
diff options
context:
space:
mode:
authorsmohanty <smohantty@gmail.com>2017-09-19 17:17:39 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-10-19 10:33:12 +0900
commit28869a939508ce30d4102b81635a655eb2514eea (patch)
treeacacc104b4bd563654a5f26b753b0c81b71a543e /src/lib/evas/canvas/evas_main.c
parent9da7a7f0d23f0240a1af721fd771667b9e0de3ba (diff)
evas/gesture: Integrated gesture framework to evas.
Diffstat (limited to '')
-rw-r--r--src/lib/evas/canvas/evas_main.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c
index fb73145010..5a2ab02eb8 100644
--- a/src/lib/evas/canvas/evas_main.c
+++ b/src/lib/evas/canvas/evas_main.c
@@ -225,6 +225,8 @@ _evas_canvas_efl_object_constructor(Eo *eo_obj, Evas_Public_Data *e)
225 eina_clist_init(&e->calc_list); 225 eina_clist_init(&e->calc_list);
226 eina_clist_init(&e->calc_done); 226 eina_clist_init(&e->calc_done);
227 227
228 e->gesture_manager = efl_add(EFL_GESTURE_MANAGER_CLASS, eo_obj);
229
228#define EVAS_ARRAY_SET(E, Array) \ 230#define EVAS_ARRAY_SET(E, Array) \
229 eina_array_step_set(&E->Array, sizeof (E->Array), \ 231 eina_array_step_set(&E->Array, sizeof (E->Array), \
230 ((1024 * sizeof (void*)) - sizeof (E->Array)) / sizeof (void*)); 232 ((1024 * sizeof (void*)) - sizeof (E->Array)) / sizeof (void*));
@@ -295,6 +297,9 @@ _evas_canvas_efl_object_destructor(Eo *eo_e, Evas_Public_Data *e)
295 _evas_post_event_callback_free(eo_e); 297 _evas_post_event_callback_free(eo_e);
296 _evas_canvas_event_shutdown(eo_e, e); 298 _evas_canvas_event_shutdown(eo_e, e);
297 299
300 efl_del(e->gesture_manager);
301 e->gesture_manager = NULL;
302
298 del = EINA_TRUE; 303 del = EINA_TRUE;
299 e->walking_list++; 304 e->walking_list++;
300 e->cleanup = 1; 305 e->cleanup = 1;
@@ -1247,7 +1252,7 @@ _evas_pointer_data_remove(Evas_Public_Data *edata, Efl_Input_Device *pointer)
1247 Evas_Pointer_Seat *pseat; 1252 Evas_Pointer_Seat *pseat;
1248 Eo *seat; 1253 Eo *seat;
1249 1254
1250 seat = efl_input_device_seat_get(pointer); 1255 seat = efl_input_device_seat_get(pointer);
1251 EINA_INLIST_FOREACH(edata->seats, pseat) 1256 EINA_INLIST_FOREACH(edata->seats, pseat)
1252 { 1257 {
1253 if (pseat->seat != seat) continue; 1258 if (pseat->seat != seat) continue;