rimmed pushed a commit to branch eflete-1.18.
http://git.enlightenment.org/tools/eflete.git/commit/?id=81b45b0a4f1ebc592d8a728379b25278dcf62b8b
commit 81b45b0a4f1ebc592d8a728379b25278dcf62b8b
Author: Andrii Kroitor <an.kroi...@samsung.com>
Date: Fri Sep 16 16:56:00 2016 +0300
spinner: use signals structure
---
src/bin/common/signals.c | 11 ++++++++++-
src/bin/common/signals.h | 8 ++++++++
src/bin/ui/property/property_common.c | 6 +++---
src/bin/ui/workspace/workspace.c | 14 +++++---------
4 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/src/bin/common/signals.c b/src/bin/common/signals.c
index c863b81..3d306d7 100644
--- a/src/bin/common/signals.c
+++ b/src/bin/common/signals.c
@@ -1,6 +1,6 @@
/*
* Edje Theme Editor
- * Copyright (C) 2013-2014 Samsung Electronics.
+ * Copyright (C) 2013-2016 Samsung Electronics.
*
* This file is part of Edje Theme Editor.
*
@@ -80,4 +80,13 @@ const Signals signals = {
},
},
},
+
+ .elm = {
+ .spinner = {
+ .changed = "changed",
+ .changed_user = "changed",
+ .drag_start = "spinner,drag,start",
+ .drag_stop = "spinner,drag,stop",
+ },
+ },
};
diff --git a/src/bin/common/signals.h b/src/bin/common/signals.h
index a78f6d9..5e5fa85 100644
--- a/src/bin/common/signals.h
+++ b/src/bin/common/signals.h
@@ -80,6 +80,14 @@ typedef struct {
} zoom;
} workspace;
} shortcut;
+ const struct {
+ const struct {
+ const char *changed;
+ const char *changed_user;
+ const char *drag_start;
+ const char *drag_stop;
+ } spinner;
+ } elm;
} Signals;
extern const Signals signals;
diff --git a/src/bin/ui/property/property_common.c
b/src/bin/ui/property/property_common.c
index 55c3906..1ff74db 100644
--- a/src/bin/ui/property/property_common.c
+++ b/src/bin/ui/property/property_common.c
@@ -373,9 +373,9 @@ _control_create(Property_Attribute *pa, Property_Action
*action, Evas_Object *pa
break;
case PROPERTY_CONTROL_SPINNER:
SPINNER_ADD(parent, content, 0.0, 9999.0, 1.0, true);
- evas_object_smart_callback_add(content, "spinner,drag,start",
_start_cb, pa);
- evas_object_smart_callback_add(content, "spinner,drag,stop",
_stop_cb, pa);
- evas_object_smart_callback_add(content, "changed",
_start_change_stop_cb, pa);
+ evas_object_smart_callback_add(content,
signals.elm.spinner.drag_start, _start_cb, pa);
+ evas_object_smart_callback_add(content,
signals.elm.spinner.drag_stop, _stop_cb, pa);
+ evas_object_smart_callback_add(content,
signals.elm.spinner.changed_user, _start_change_stop_cb, pa);
evas_object_event_callback_priority_add(content,
EVAS_CALLBACK_MOUSE_WHEEL,
diff --git a/src/bin/ui/workspace/workspace.c b/src/bin/ui/workspace/workspace.c
index 90e0a52..2bfd2d0 100644
--- a/src/bin/ui/workspace/workspace.c
+++ b/src/bin/ui/workspace/workspace.c
@@ -502,7 +502,7 @@ _zoom_controls_add(Workspace_Data *wd)
SPINNER_ADD(wd->toolbar.obj, wd->toolbar.zoom.cmb_zoom, 10, 1000, 10, true);
evas_object_size_hint_min_set(wd->toolbar.zoom.cmb_zoom, 76, 0);
elm_spinner_value_set(wd->toolbar.zoom.cmb_zoom, 100);
- evas_object_smart_callback_add(wd->toolbar.zoom.cmb_zoom, "changed",
_spinner_zoom_cb, wd);
+ evas_object_smart_callback_add(wd->toolbar.zoom.cmb_zoom,
signals.elm.spinner.changed_user, _spinner_zoom_cb, wd);
elm_object_part_content_set(zoom_layout, "swallow.spinner",
wd->toolbar.zoom.cmb_zoom);
tb_it = elm_toolbar_item_append(wd->toolbar.obj, NULL, NULL, NULL, NULL);
elm_object_item_part_content_set(tb_it, NULL, zoom_layout);
@@ -618,11 +618,9 @@ _container_size_controls_add(Workspace_Data *wd)
tb_it = elm_toolbar_item_append(wd->toolbar.obj, NULL, NULL, NULL, NULL);
elm_toolbar_item_separator_set(tb_it, true);
- wd->toolbar.container_sizer.spinner_w = elm_spinner_add(wd->toolbar.obj);
- elm_spinner_min_max_set(wd->toolbar.container_sizer.spinner_w, 0, 9999);
- elm_spinner_editable_set(wd->toolbar.container_sizer.spinner_w, true);
+ SPINNER_ADD(wd->toolbar.obj, wd->toolbar.container_sizer.spinner_w, 0,
9999, 1, true);
elm_object_style_set(wd->toolbar.container_sizer.spinner_w, "vertical");
- evas_object_smart_callback_add(wd->toolbar.container_sizer.spinner_w,
"changed", _spinner_container_change, wd);
+ evas_object_smart_callback_add(wd->toolbar.container_sizer.spinner_w,
signals.elm.spinner.changed_user, _spinner_container_change, wd);
#if !HAVE_TIZEN
tb_it = elm_toolbar_item_append(wd->toolbar.obj, NULL, NULL, NULL, NULL);
elm_object_item_part_content_set(tb_it, NULL,
wd->toolbar.container_sizer.spinner_w);
@@ -641,11 +639,9 @@ _container_size_controls_add(Workspace_Data *wd)
elm_object_part_content_set(size_controls, "chain",
wd->toolbar.container_sizer.check_chain);
#endif
- wd->toolbar.container_sizer.spinner_h = elm_spinner_add(wd->toolbar.obj);
- elm_spinner_min_max_set(wd->toolbar.container_sizer.spinner_h, 0, 9999);
- elm_spinner_editable_set(wd->toolbar.container_sizer.spinner_h, true);
+ SPINNER_ADD(wd->toolbar.obj, wd->toolbar.container_sizer.spinner_h, 0,
9999, 1, true);
elm_object_style_set(wd->toolbar.container_sizer.spinner_h, "vertical");
- evas_object_smart_callback_add(wd->toolbar.container_sizer.spinner_h,
"changed", _spinner_container_change, wd);
+ evas_object_smart_callback_add(wd->toolbar.container_sizer.spinner_h,
signals.elm.spinner.changed_user, _spinner_container_change, wd);
#if !HAVE_TIZEN
tb_it = elm_toolbar_item_append(wd->toolbar.obj, NULL, NULL, NULL, NULL);
elm_object_item_part_content_set(tb_it, NULL,
wd->toolbar.container_sizer.spinner_h);
--
