summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2020-01-30 10:46:24 -0500
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2020-02-14 09:20:24 +0100
commit7da4ab3633e6ddb4cdd4a562485512bd874667b9 (patch)
treec4787de9f739dbcd5194895442a0a889a2f1390a
parent94a29d05dea1e9c35b9f595119dd6f73d79fdb5b (diff)
downloadefl-7da4ab3633e6ddb4cdd4a562485512bd874667b9.tar.gz
efl/gesture: remove manager config
we can just use efl.config here instead of duplicating it Reviewed-by: Marcel Hollerbach <mail@marcel-hollerbach.de> Differential Revision: https://phab.enlightenment.org/D11248
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_manager.c29
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_manager.eo13
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_recognizer.c6
3 files changed, 6 insertions, 42 deletions
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_manager.c b/src/lib/evas/gesture/efl_canvas_gesture_manager.c
index 38dfbe667b..6399227dc5 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_manager.c
+++ b/src/lib/evas/gesture/efl_canvas_gesture_manager.c
@@ -27,7 +27,6 @@ typedef struct _Efl_Canvas_Gesture_Manager_Data
//Lazy deletion of gestures
Eina_Array *m_gestures_to_delete;
//Kepps config values for gesture recognize
- Eina_Hash *m_config;
Eina_Bool processing : 1;
} Efl_Canvas_Gesture_Manager_Data;
@@ -101,6 +100,7 @@ _update_finger_sizes(Efl_Canvas_Gesture_Manager_Data *pd, int finger_size)
EOLIAN static Efl_Object *
_efl_canvas_gesture_manager_efl_object_constructor(Eo *obj, Efl_Canvas_Gesture_Manager_Data *pd)
{
+ Eo *config;
obj = efl_constructor(efl_super(obj, MY_CLASS));
pd->m_recognizers = eina_hash_pointer_new(EINA_FREE_CB(_hash_unref_cb));
@@ -109,9 +109,9 @@ _efl_canvas_gesture_manager_efl_object_constructor(Eo *obj, Efl_Canvas_Gesture_M
pd->m_object_gestures = NULL;
pd->m_gestures_to_delete = eina_array_new(1);;
- pd->m_config = eina_hash_string_superfast_new(EINA_FREE_CB(eina_value_free));
/* this needs to always be present */
- eina_hash_add(pd->m_config, "glayer_tap_finger_size", eina_value_int_new(EFL_GESTURE_RECOGNIZER_TYPE_TAP_FINGER_SIZE));
+ config = efl_provider_find(efl_main_loop_get(), EFL_CONFIG_INTERFACE);
+ efl_config_int_set(config, "glayer_tap_finger_size", EFL_GESTURE_RECOGNIZER_TYPE_TAP_FINGER_SIZE);
//Register all types of recognizers at very first time.
efl_gesture_manager_recognizer_register(obj, efl_add(EFL_CANVAS_GESTURE_RECOGNIZER_TAP_CLASS, obj));
@@ -126,35 +126,12 @@ _efl_canvas_gesture_manager_efl_object_constructor(Eo *obj, Efl_Canvas_Gesture_M
return obj;
}
-EOLIAN static Eina_Value *
-_efl_canvas_gesture_manager_config_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Gesture_Manager_Data *pd, const char *name)
-{
- return eina_hash_find(pd->m_config, name);
-}
-
-EOLIAN static void
-_efl_canvas_gesture_manager_config_set(Eo *obj, Efl_Canvas_Gesture_Manager_Data *pd, const char *name, Eina_Value *value)
-{
- Eina_Value *v;
- int finger_size;
-
- EINA_SAFETY_ON_NULL_RETURN(name);
- v = eina_value_new(eina_value_type_get(value));
- eina_value_copy(value, v);
- eina_hash_add(pd->m_config, name, v);
- efl_event_callback_call(obj, EFL_GESTURE_MANAGER_EVENT_CONFIG_CHANGED, (void*)name);
- if (!eina_streq(name, "glayer_tap_finger_size")) return;
- eina_value_get(value, &finger_size);
- _update_finger_sizes(pd, finger_size);
-}
-
EOLIAN static void
_efl_canvas_gesture_manager_efl_object_destructor(Eo *obj, Efl_Canvas_Gesture_Manager_Data *pd EINA_UNUSED)
{
Efl_Canvas_Gesture_Recognizer *recognizer;
void *ptr;
- eina_hash_free(pd->m_config);
eina_hash_free(pd->m_recognizers);
EINA_LIST_FREE(pd->custom_recognizers, recognizer)
efl_unref(recognizer);
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_manager.eo b/src/lib/evas/gesture/efl_canvas_gesture_manager.eo
index eaf27300ba..04e08f2d50 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_manager.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture_manager.eo
@@ -22,19 +22,6 @@ class @beta Efl.Canvas.Gesture_Manager extends Efl.Object
@in recognizer: Efl.Canvas.Gesture_Recognizer; [[The gesture recognizer object.]]
}
}
- @property config {
- [[This property holds configuration values for the recognizer.]]
- set {
- }
- get {
- }
- keys {
- name: string; [[Property name.]]
- }
- values {
- value: any_value_ref; [[Value of the property.]]
- }
- }
recognizer_cleanup {
[[Perform cleanup for a gesture which ends after a delay.]]
params {
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_recognizer.c b/src/lib/evas/gesture/efl_canvas_gesture_recognizer.c
index ee67006879..995217ca85 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_recognizer.c
+++ b/src/lib/evas/gesture/efl_canvas_gesture_recognizer.c
@@ -7,9 +7,9 @@
Eina_Value *
_recognizer_config_get(const Eo *obj, const char *name)
{
- Eo *manager = efl_provider_find(obj, EFL_CANVAS_GESTURE_MANAGER_CLASS);
- EINA_SAFETY_ON_NULL_RETURN_VAL(manager, NULL);
- return efl_gesture_manager_config_get(manager, name);
+ Eo *config = efl_provider_find(efl_main_loop_get(), EFL_CONFIG_INTERFACE);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(config, NULL);
+ return efl_config_get(config, name);
}
EOLIAN static void