e_service_quickpanel: move code for cancelation of touch events to quickpanel from...

I think we have not to raise the event of cancelation of touch in case
indicator state is off or unknown.

Change-Id: Id6a37049057eec29a5ae57c65183283e8c388714

diff --git a/src/bin/services/e_service_gesture.c b/src/bin/services/e_service_gesture.c
index b793c78..9e39b00 100644 (file)
--- a/src/bin/services/e_service_gesture.c
+++ b/src/bin/services/e_service_gesture.c
@@ -141,11 +141,6 @@ _gesture_obj_cb_mouse_move(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj,
         gesture->active = _gesture_check(gesture, obj, x, y, timestamp);
         if (gesture->active)
           {
-             /* if gesture is activated, terminate main touch event processing
-              * in enlightenment */
-             if (gesture->type != POL_GESTURE_TYPE_NONE)
-               e_comp_wl_touch_cancel();
-
              if (gesture->cb.start)
                gesture->cb.start(gesture->cb.data, obj, x, y, timestamp);
           }
@@ -236,4 +231,4 @@ e_service_gesture_angle_set(E_Policy_Gesture *gesture, int angle)
 {
    EINA_SAFETY_ON_NULL_RETURN(gesture);
    gesture->angle = angle;
-}
\ No newline at end of file
+}

diff --git a/src/bin/services/e_service_quickpanel.c b/src/bin/services/e_service_quickpanel.c
index 4489097..d7319f4 100644 (file)
--- a/src/bin/services/e_service_quickpanel.c
+++ b/src/bin/services/e_service_quickpanel.c
@@ -693,6 +693,8 @@ _quickpanel_send_gesture_to_indicator(void)
           {
              if (focused->indicator.visible_type == 0) // visible: hidden
                {
+                  /* cancel touch events sended up to now */
+                  e_comp_wl_touch_cancel();
                   e_policy_wl_indicator_flick_send(focused);
                   return EINA_TRUE;
                }
@@ -724,6 +726,9 @@ _region_obj_cb_gesture_start(void *data, Evas_Object *handler, int x, int y, uns
    if (_quickpanel_send_gesture_to_indicator())
      return;
 
+   /* cancel touch events sended up to now */
+   e_comp_wl_touch_cancel();
+
    if (qp->mover)
      {
         if (_mover_obj_is_animating(qp->mover))