[EGIT] [tools/eflete] master 01/01: shortcuts: block shortcuts on zoom dragging

[Vitalii Vorobiov]

rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=593e54f056bb9554dba31cab679177802c0f2613

commit 593e54f056bb9554dba31cab679177802c0f2613
Author: Vitalii Vorobiov <vi.vorob...@samsung.com>
Date:   Wed Jul 6 17:39:23 2016 +0300

    shortcuts: block shortcuts on zoom dragging
    
    @fix
---
 src/bin/ui/shortcuts/shortcuts.c |  4 ++--
 src/bin/ui/workspace/workspace.c | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/bin/ui/shortcuts/shortcuts.c b/src/bin/ui/shortcuts/shortcuts.c
index a41992c..d508626 100644
--- a/src/bin/ui/shortcuts/shortcuts.c
+++ b/src/bin/ui/shortcuts/shortcuts.c
@@ -219,9 +219,9 @@ _mouse_wheel_event_cb(void *data __UNUSED__, int type 
__UNUSED__, void *event)
      return ECORE_CALLBACK_PASS_ON;
 
    if (ev->z > 0)
-     evas_object_smart_callback_call(ap.win, SIGNAL_SHORTCUT_ZOOM_OUT, NULL);
+     _shortcut_handle(SHORTCUT_TYPE_ZOOM_OUT);
    else if (ev->z < 0)
-     evas_object_smart_callback_call(ap.win, SIGNAL_SHORTCUT_ZOOM_IN, NULL);
+     _shortcut_handle(SHORTCUT_TYPE_ZOOM_IN);
 
    return ECORE_CALLBACK_DONE;
 }
diff --git a/src/bin/ui/workspace/workspace.c b/src/bin/ui/workspace/workspace.c
index 9e0e5b2..a12dbf0 100644
--- a/src/bin/ui/workspace/workspace.c
+++ b/src/bin/ui/workspace/workspace.c
@@ -296,6 +296,21 @@ _fit_cb(void *data,
 }
 
 static void
+_slider_zoom_stop_cb(void *data __UNUSED__,
+                Evas_Object *obj,
+                void *event_info __UNUSED__)
+{
+   shortcuts_object_check_pop(obj);
+}
+static void
+_slider_zoom_start_cb(void *data __UNUSED__,
+                      Evas_Object *obj,
+                      void *event_info __UNUSED__)
+{
+   shortcuts_object_push(obj);
+}
+
+static void
 _slider_zoom_cb(void *data,
                 Evas_Object *obj __UNUSED__,
                 void *event_info __UNUSED__)
@@ -394,7 +409,9 @@ _zoom_controls_add(Workspace_Data *wd)
    wd->toolbar.zoom.slider = elm_slider_add(wd->toolbar.obj);
    elm_slider_min_max_set(wd->toolbar.zoom.slider, 10.0, 1000.0);
    elm_slider_value_set(wd->toolbar.zoom.slider, 100);
+   evas_object_smart_callback_add(wd->toolbar.zoom.slider, 
"slider,drag,start", _slider_zoom_start_cb, wd);
    evas_object_smart_callback_add(wd->toolbar.zoom.slider, "changed", 
_slider_zoom_cb, wd);
+   evas_object_smart_callback_add(wd->toolbar.zoom.slider, "slider,drag,stop", 
_slider_zoom_stop_cb, wd);
    IMAGE_ADD_NEW(wd->toolbar.zoom.slider, img, "icon", "scale_smaller")
    elm_object_part_content_set(wd->toolbar.zoom.slider, "elm.swallow.icon", 
img);
    IMAGE_ADD_NEW(wd->toolbar.zoom.slider, img, "icon", "scale_larger")

--