efl-ext: sync with tizen 6.0

Change-Id: I6b3d7953613e51cceaf47f9a8292ec9e0c1605d7

diff --git a/src/wearable/circle/efl_extension_circle_object_slider.c b/src/wearable/circle/efl_extension_circle_object_slider.c
index af8742bfe966d586a2d2b09a8533deaa38daecf4..f9b1da904031bf7a81d433bb21b6821550246902 100644 (file)
--- a/src/wearable/circle/efl_extension_circle_object_slider.c
+++ b/src/wearable/circle/efl_extension_circle_object_slider.c
@@ -347,7 +347,7 @@ _mouse_down_cb(void *data,
              _angle_drag_set(obj, new_angle);
 
              widget_data->drag = EINA_TRUE;
-             efl_ui_widget_scroll_freeze_push(img_obj);
+             efl_ui_widget_scroll_freeze_push(obj);
           }
         else
           {
@@ -393,10 +393,7 @@ _mouse_move_cb(void *data,
      }
 
    if (widget_data->drag)
-     {
-//ONEUI1.5(20181219):Remove condition (P181219-04184)
         _angle_drag_set(obj, _angle_calculate(obj, ev->cur.canvas.x, ev->cur.canvas.y));
-     }
 }
 
 static void
@@ -423,7 +420,7 @@ _mouse_up_cb(void *data,
         _hide_cue_effect(obj);
 
         widget_data->drag = EINA_FALSE;
-        efl_ui_widget_scroll_freeze_pop(img_obj);
+        efl_ui_widget_scroll_freeze_pop(obj);
      }
    else if (widget_data->tap)
      {
@@ -454,9 +451,6 @@ _mouse_out_cb(void *data,
 
    if (circle_obj->disabled) return;
 
-   widget_data->drag = EINA_FALSE;
-   widget_data->tap = EINA_FALSE;
-
    widget_data->pressed_point.x = -1;
    widget_data->pressed_point.y = -1;
 }

diff --git a/src/wearable/circle/efl_extension_rotary.c b/src/wearable/circle/efl_extension_rotary.c
index 6fd273a85e2acc0ea6b95f452900b07448f4c528..903d65465c0b5d1f3c5623dd216296a859954a41 100644 (file)
--- a/src/wearable/circle/efl_extension_rotary.c
+++ b/src/wearable/circle/efl_extension_rotary.c
@@ -27,6 +27,7 @@
  #include <Ecore_Input.h>
 #endif
 
+
 #define TIZEN_DEV "tizen_detent"
 
 static const char SIG_ACTIVATED[] = "rotary,activated";
@@ -478,6 +479,7 @@ eext_rotary_event_changed_callback_del(Eext_Rotary_Event_Changed_Cb cb)
         LOGE("failed to delete rotary event changed callback. ret: %d", ret);
      }
 }
+
 #ifdef WITH_WAYLAND
 static void
 _rotary_rotate_event_free(void *udata EINA_UNUSED, void *fdata)