summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWoochanlee <wc0917.lee@samsung.com>2019-06-05 20:31:19 +0900
committerJaehyun Cho <jae_hyun.cho@samsung.com>2019-06-05 20:31:41 +0900
commit7ecc1815baa413f577faa3b92e50134491d9ef48 (patch)
tree947e99e26b431e7a9a83a14fbe2eee6ab056e3cd
parenta4bcd1549899da24277f42f92e9400c7ba426e67 (diff)
efl_gesture_manager: Delete type property.
Summary: User already know the gesture type. And the gesture type(Efl.Event.Description) can't using after binding. T7959 Reviewers: Jaehyun_Cho Reviewed By: Jaehyun_Cho Subscribers: cedric, #reviewers, #committers Tags: #efl Maniphest Tasks: T7959 Differential Revision: https://phab.enlightenment.org/D9033
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture.c6
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture.eo8
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_manager.c4
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_private.h1
4 files changed, 7 insertions, 12 deletions
diff --git a/src/lib/evas/gesture/efl_canvas_gesture.c b/src/lib/evas/gesture/efl_canvas_gesture.c
index a593684..0cc7f8d 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture.c
+++ b/src/lib/evas/gesture/efl_canvas_gesture.c
@@ -2,9 +2,11 @@
2 2
3#define MY_CLASS EFL_CANVAS_GESTURE_CLASS 3#define MY_CLASS EFL_CANVAS_GESTURE_CLASS
4 4
5EOLIAN static const Efl_Event_Description * 5const Efl_Event_Description *
6 _efl_canvas_gesture_type_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Gesture_Data *pd) 6_efl_gesture_type_get(const Eo *obj)
7{ 7{
8 Efl_Canvas_Gesture_Data *pd = efl_data_scope_get(obj, EFL_CANVAS_GESTURE_CLASS);
9
8 return pd->type; 10 return pd->type;
9} 11}
10 12
diff --git a/src/lib/evas/gesture/efl_canvas_gesture.eo b/src/lib/evas/gesture/efl_canvas_gesture.eo
index 2a097d5..c703237 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture.eo
@@ -11,14 +11,6 @@ abstract @beta Efl.Canvas.Gesture extends Efl.Object
11 information to the user.]] 11 information to the user.]]
12 c_prefix: efl_gesture; 12 c_prefix: efl_gesture;
13 methods { 13 methods {
14 @property type {
15 [[This property holds the type of the gesture.]]
16 get {
17 }
18 values {
19 @cref type: Efl.Event_Description; [[gesture type]]
20 }
21 }
22 @property state { 14 @property state {
23 [[This property holds the current state of the gesture.]] 15 [[This property holds the current state of the gesture.]]
24 get { 16 get {
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_manager.c b/src/lib/evas/gesture/efl_canvas_gesture_manager.c
index 8696004..4fbb4d4 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_manager.c
+++ b/src/lib/evas/gesture/efl_canvas_gesture_manager.c
@@ -262,7 +262,7 @@ _efl_canvas_gesture_manager_recognizer_register(Eo *obj EINA_UNUSED, Efl_Canvas_
262 if (!dummy) 262 if (!dummy)
263 return; 263 return;
264 264
265 const Efl_Event_Description *type = efl_gesture_type_get(dummy); 265 const Efl_Event_Description *type = _efl_gesture_type_get(dummy);
266 266
267 //Add the recognizer to the m_recognizers 267 //Add the recognizer to the m_recognizers
268 eina_hash_add(pd->m_recognizers, &type, efl_ref(recognizer)); 268 eina_hash_add(pd->m_recognizers, &type, efl_ref(recognizer));
@@ -288,7 +288,7 @@ _efl_canvas_gesture_manager_recognizer_unregister(Eo *obj EINA_UNUSED, Efl_Canva
288 dummy = efl_gesture_recognizer_add(recognizer, 0); 288 dummy = efl_gesture_recognizer_add(recognizer, 0);
289 if (!dummy)return; 289 if (!dummy)return;
290 290
291 type = efl_gesture_type_get(dummy); 291 type = _efl_gesture_type_get(dummy);
292 efl_del(dummy); 292 efl_del(dummy);
293 293
294 //Check if its already registered 294 //Check if its already registered
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_private.h b/src/lib/evas/gesture/efl_canvas_gesture_private.h
index cfe588a..ceb7ca7 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_private.h
+++ b/src/lib/evas/gesture/efl_canvas_gesture_private.h
@@ -10,6 +10,7 @@
10 10
11#include <Ecore.h> 11#include <Ecore.h>
12 12
13const Efl_Event_Description * _efl_gesture_type_get(const Eo *obj);
13void efl_gesture_manager_gesture_clean_up(Eo *obj, Eo *target, const Efl_Event_Description *type); 14void efl_gesture_manager_gesture_clean_up(Eo *obj, Eo *target, const Efl_Event_Description *type);
14 15
15typedef struct _Efl_Canvas_Gesture_Manager_Data Efl_Canvas_Gesture_Manager_Data; 16typedef struct _Efl_Canvas_Gesture_Manager_Data Efl_Canvas_Gesture_Manager_Data;