efl_ui_scrollbar_direction: replace with efl_ui_layout_orientation

Summary: ref T7924, T7884

Reviewers: segfaultxavi, bu5hm4n

Subscribers: zmike, cedric, #reviewers, #committers

Tags: #efl

Maniphest Tasks: T7924, T7884

Differential Revision: https://phab.enlightenment.org/D9612

diff --git a/src/lib/efl/interfaces/efl_ui_scrollbar.eo b/src/lib/efl/interfaces/efl_ui_scrollbar.eo
index 46d3aae..ff40310 100644 (file)
--- a/src/lib/efl/interfaces/efl_ui_scrollbar.eo
+++ b/src/lib/efl/interfaces/efl_ui_scrollbar.eo
@@ -1,3 +1,5 @@
+import efl_ui_layout_orientable;
+
 enum @beta Efl.Ui.Scrollbar_Mode
 {
    [[When should the scrollbar be shown.]]
@@ -7,13 +9,6 @@ enum @beta Efl.Ui.Scrollbar_Mode
    last      [[For internal use only]]
 }
 
-enum @beta Efl.Ui.Scrollbar_Direction
-{
-   [[What kind of scrollbar is this.]]
-   horizontal = 0, [[Goes along the X axis.]]
-   vertical,       [[Goes along the Y axis.]]
-   last            [[For internal use only]]
-}
 interface @beta Efl.Ui.Scrollbar
 {
    [[Interface used by widgets which can display scrollbars, enabling them to contain more content
@@ -63,12 +58,12 @@ interface @beta Efl.Ui.Scrollbar
       }
    }
    events {
-      bar,press: Efl.Ui.Scrollbar_Direction; [[Called when bar is pressed.]]
-      bar,unpress: Efl.Ui.Scrollbar_Direction; [[Called when bar is unpressed.]]
-      bar,drag: Efl.Ui.Scrollbar_Direction; [[Called when bar is dragged.]]
+      bar,press: Efl.Ui.Layout_Orientation; [[Called when bar is pressed.]]
+      bar,unpress: Efl.Ui.Layout_Orientation; [[Called when bar is unpressed.]]
+      bar,drag: Efl.Ui.Layout_Orientation; [[Called when bar is dragged.]]
       bar,size,changed: void; [[Called when bar size is changed.]]
       bar,pos,changed: void; [[Called when bar position is changed.]]
-      bar,show: Efl.Ui.Scrollbar_Direction; [[Callend when bar is shown.]]
-      bar,hide: Efl.Ui.Scrollbar_Direction; [[Called when bar is hidden.]]
+      bar,show: Efl.Ui.Layout_Orientation; [[Callend when bar is shown.]]
+      bar,hide: Efl.Ui.Layout_Orientation; [[Called when bar is hidden.]]
    }
 }

diff --git a/src/lib/elementary/efl_ui_image_zoomable.c b/src/lib/elementary/efl_ui_image_zoomable.c
index b696169..5564561 100644 (file)
--- a/src/lib/elementary/efl_ui_image_zoomable.c
+++ b/src/lib/elementary/efl_ui_image_zoomable.c
@@ -1402,7 +1402,7 @@ _efl_ui_image_zoomable_vbar_drag_cb(void *data,
 {
    _efl_ui_image_zoomable_bar_read_and_update(data);
 
-   Efl_Ui_Scrollbar_Direction type = EFL_UI_SCROLLBAR_DIRECTION_VERTICAL;
+   Efl_Ui_Layout_Orientation type = EFL_UI_LAYOUT_ORIENTATION_VERTICAL;
    efl_event_callback_call(data, EFL_UI_SCROLLBAR_EVENT_BAR_DRAG, &type);
 }
 
@@ -1412,7 +1412,7 @@ _efl_ui_image_zoomable_vbar_press_cb(void *data,
                                      const char *emission EINA_UNUSED,
                                      const char *source EINA_UNUSED)
 {
-   Efl_Ui_Scrollbar_Direction type = EFL_UI_SCROLLBAR_DIRECTION_VERTICAL;
+   Efl_Ui_Layout_Orientation type = EFL_UI_LAYOUT_ORIENTATION_VERTICAL;
    efl_event_callback_call(data, EFL_UI_SCROLLBAR_EVENT_BAR_PRESS, &type);
 }
 
@@ -1422,7 +1422,7 @@ _efl_ui_image_zoomable_vbar_unpress_cb(void *data,
                                        const char *emission EINA_UNUSED,
                                        const char *source EINA_UNUSED)
 {
-   Efl_Ui_Scrollbar_Direction type = EFL_UI_SCROLLBAR_DIRECTION_VERTICAL;
+   Efl_Ui_Layout_Orientation type = EFL_UI_LAYOUT_ORIENTATION_VERTICAL;
    efl_event_callback_call(data, EFL_UI_SCROLLBAR_EVENT_BAR_UNPRESS, &type);
 }
 
@@ -1472,7 +1472,7 @@ _efl_ui_image_zoomable_hbar_drag_cb(void *data,
 {
    _efl_ui_image_zoomable_bar_read_and_update(data);
 
-   Efl_Ui_Scrollbar_Direction type = EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL;
+   Efl_Ui_Layout_Orientation type = EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL;
    efl_event_callback_call(data, EFL_UI_SCROLLBAR_EVENT_BAR_DRAG, &type);
 }
 
@@ -1482,7 +1482,7 @@ _efl_ui_image_zoomable_hbar_press_cb(void *data,
                                      const char *emission EINA_UNUSED,
                                      const char *source EINA_UNUSED)
 {
-   Efl_Ui_Scrollbar_Direction type = EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL;
+   Efl_Ui_Layout_Orientation type = EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL;
    efl_event_callback_call(data, EFL_UI_SCROLLBAR_EVENT_BAR_PRESS, &type);
 }
 
@@ -1492,7 +1492,7 @@ _efl_ui_image_zoomable_hbar_unpress_cb(void *data,
                                        const char *emission EINA_UNUSED,
                                        const char *source EINA_UNUSED)
 {
-   Efl_Ui_Scrollbar_Direction type = EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL;
+   Efl_Ui_Layout_Orientation type = EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL;
    efl_event_callback_call(data, EFL_UI_SCROLLBAR_EVENT_BAR_UNPRESS, &type);
 }
 
@@ -1547,20 +1547,20 @@ _efl_ui_image_zoomable_bar_show_cb(void *data, const Efl_Event *event)
 {
    Eo *obj = data;
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
-   Efl_Ui_Scrollbar_Direction type = *(Efl_Ui_Scrollbar_Direction *)(event->info);
+   Efl_Ui_Layout_Orientation type = *(Efl_Ui_Layout_Orientation *)(event->info);
 
    if (elm_widget_is_legacy(obj))
      {
-        if (type == EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL)
+        if (type == EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL)
           edje_object_signal_emit(wd->resize_obj, "elm,action,show,hbar", "elm");
-        else if (type == EFL_UI_SCROLLBAR_DIRECTION_VERTICAL)
+        else if (type == EFL_UI_LAYOUT_ORIENTATION_VERTICAL)
           edje_object_signal_emit(wd->resize_obj, "elm,action,show,vbar", "elm");
      }
    else
      {
-        if (type == EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL)
+        if (type == EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL)
           edje_object_signal_emit(wd->resize_obj, "efl,action,show,hbar", "efl");
-        else if (type == EFL_UI_SCROLLBAR_DIRECTION_VERTICAL)
+        else if (type == EFL_UI_LAYOUT_ORIENTATION_VERTICAL)
           edje_object_signal_emit(wd->resize_obj, "efl,action,show,vbar", "efl");
      }
 }
@@ -1570,20 +1570,20 @@ _efl_ui_image_zoomable_bar_hide_cb(void *data, const Efl_Event *event)
 {
    Eo *obj = data;
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
-   Efl_Ui_Scrollbar_Direction type = *(Efl_Ui_Scrollbar_Direction *)(event->info);
+   Efl_Ui_Layout_Orientation type = *(Efl_Ui_Layout_Orientation *)(event->info);
 
    if (elm_widget_is_legacy(obj))
      {
-        if (type == EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL)
+        if (type == EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL)
           edje_object_signal_emit(wd->resize_obj, "elm,action,hide,hbar", "elm");
-        else if (type == EFL_UI_SCROLLBAR_DIRECTION_VERTICAL)
+        else if (type == EFL_UI_LAYOUT_ORIENTATION_VERTICAL)
           edje_object_signal_emit(wd->resize_obj, "elm,action,hide,vbar", "elm");
      }
    else
      {
-        if (type == EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL)
+        if (type == EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL)
           edje_object_signal_emit(wd->resize_obj, "efl,action,hide,hbar", "efl");
-        else if (type == EFL_UI_SCROLLBAR_DIRECTION_VERTICAL)
+        else if (type == EFL_UI_LAYOUT_ORIENTATION_VERTICAL)
           edje_object_signal_emit(wd->resize_obj, "efl,action,hide,vbar", "efl");
      }
 }

diff --git a/src/lib/elementary/efl_ui_list_view.c b/src/lib/elementary/efl_ui_list_view.c
index 1759c18..976ba1b 100644 (file)
--- a/src/lib/elementary/efl_ui_list_view.c
+++ b/src/lib/elementary/efl_ui_list_view.c
@@ -288,7 +288,7 @@ _efl_ui_list_view_vbar_drag_cb(void *data,
 {
    _efl_ui_list_view_bar_read_and_update(data);
 
-   Efl_Ui_Scrollbar_Direction type = EFL_UI_SCROLLBAR_DIRECTION_VERTICAL;
+   Efl_Ui_Layout_Orientation type = EFL_UI_LAYOUT_ORIENTATION_VERTICAL;
    efl_event_callback_call(data, EFL_UI_SCROLLBAR_EVENT_BAR_DRAG, &type);
 }
 
@@ -298,7 +298,7 @@ _efl_ui_list_view_vbar_press_cb(void *data,
                                const char *emission EINA_UNUSED,
                                const char *source EINA_UNUSED)
 {
-   Efl_Ui_Scrollbar_Direction type = EFL_UI_SCROLLBAR_DIRECTION_VERTICAL;
+   Efl_Ui_Layout_Orientation type = EFL_UI_LAYOUT_ORIENTATION_VERTICAL;
    efl_event_callback_call(data, EFL_UI_SCROLLBAR_EVENT_BAR_PRESS, &type);
 }
 
@@ -308,7 +308,7 @@ _efl_ui_list_view_vbar_unpress_cb(void *data,
                                  const char *emission EINA_UNUSED,
                                  const char *source EINA_UNUSED)
 {
-   Efl_Ui_Scrollbar_Direction type = EFL_UI_SCROLLBAR_DIRECTION_VERTICAL;
+   Efl_Ui_Layout_Orientation type = EFL_UI_LAYOUT_ORIENTATION_VERTICAL;
    efl_event_callback_call(data, EFL_UI_SCROLLBAR_EVENT_BAR_UNPRESS, &type);
 }
 
@@ -358,7 +358,7 @@ _efl_ui_list_view_hbar_drag_cb(void *data,
 {
    _efl_ui_list_view_bar_read_and_update(data);
 
-   Efl_Ui_Scrollbar_Direction type = EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL;
+   Efl_Ui_Layout_Orientation type = EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL;
    efl_event_callback_call(data, EFL_UI_SCROLLBAR_EVENT_BAR_DRAG, &type);
 }
 
@@ -368,7 +368,7 @@ _efl_ui_list_view_hbar_press_cb(void *data,
                           const char *emission EINA_UNUSED,
                           const char *source EINA_UNUSED)
 {
-   Efl_Ui_Scrollbar_Direction type = EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL;
+   Efl_Ui_Layout_Orientation type = EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL;
    efl_event_callback_call(data, EFL_UI_SCROLLBAR_EVENT_BAR_PRESS, &type);
 }
 
@@ -378,7 +378,7 @@ _efl_ui_list_view_hbar_unpress_cb(void *data,
                             const char *emission EINA_UNUSED,
                             const char *source EINA_UNUSED)
 {
-   Efl_Ui_Scrollbar_Direction type = EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL;
+   Efl_Ui_Layout_Orientation type = EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL;
    efl_event_callback_call(data, EFL_UI_SCROLLBAR_EVENT_BAR_UNPRESS, &type);
 }
 
@@ -417,11 +417,11 @@ _efl_ui_list_view_bar_show_cb(void *data, const Efl_Event *event)
 {
    Eo *obj = data;
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
-   Efl_Ui_Scrollbar_Direction type = *(Efl_Ui_Scrollbar_Direction *)(event->info);
+   Efl_Ui_Layout_Orientation type = *(Efl_Ui_Layout_Orientation *)(event->info);
 
-   if (type == EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL)
+   if (type == EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL)
      edje_object_signal_emit(wd->resize_obj, "efl,action,show,hbar", "efl");
-   else if (type == EFL_UI_SCROLLBAR_DIRECTION_VERTICAL)
+   else if (type == EFL_UI_LAYOUT_ORIENTATION_VERTICAL)
      edje_object_signal_emit(wd->resize_obj, "efl,action,show,vbar", "efl");
 }
 
@@ -430,11 +430,11 @@ _efl_ui_list_view_bar_hide_cb(void *data, const Efl_Event *event)
 {
    Eo *obj = data;
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
-   Efl_Ui_Scrollbar_Direction type = *(Efl_Ui_Scrollbar_Direction *)(event->info);
+   Efl_Ui_Layout_Orientation type = *(Efl_Ui_Layout_Orientation *)(event->info);
 
-   if (type == EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL)
+   if (type == EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL)
      edje_object_signal_emit(wd->resize_obj, "efl,action,hide,hbar", "efl");
-   else if (type == EFL_UI_SCROLLBAR_DIRECTION_VERTICAL)
+   else if (type == EFL_UI_LAYOUT_ORIENTATION_VERTICAL)
      edje_object_signal_emit(wd->resize_obj, "efl,action,hide,vbar", "efl");
 }
 

diff --git a/src/lib/elementary/efl_ui_scroll_manager.c b/src/lib/elementary/efl_ui_scroll_manager.c
index 63654f3..393f5ee 100644 (file)
--- a/src/lib/elementary/efl_ui_scroll_manager.c
+++ b/src/lib/elementary/efl_ui_scroll_manager.c
@@ -2038,12 +2038,12 @@ _efl_ui_scroll_manager_scrollbar_h_visibility_apply(Efl_Ui_Scroll_Manager_Data *
 {
    if (sd->hbar_visible)
      {
-        Efl_Ui_Scrollbar_Direction type = EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL;
+        Efl_Ui_Layout_Orientation type = EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL;
         efl_event_callback_call(sd->parent, EFL_UI_SCROLLBAR_EVENT_BAR_SHOW, &type);
      }
    else
      {
-        Efl_Ui_Scrollbar_Direction type = EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL;
+        Efl_Ui_Layout_Orientation type = EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL;
         efl_event_callback_call(sd->parent, EFL_UI_SCROLLBAR_EVENT_BAR_HIDE, &type);
      }
 }
@@ -2053,12 +2053,12 @@ _efl_ui_scroll_manager_scrollbar_v_visibility_apply(Efl_Ui_Scroll_Manager_Data *
 {
    if (sd->vbar_visible)
      {
-        Efl_Ui_Scrollbar_Direction type = EFL_UI_SCROLLBAR_DIRECTION_VERTICAL;
+        Efl_Ui_Layout_Orientation type = EFL_UI_LAYOUT_ORIENTATION_VERTICAL;
         efl_event_callback_call(sd->parent, EFL_UI_SCROLLBAR_EVENT_BAR_SHOW, &type);
      }
    else
      {
-        Efl_Ui_Scrollbar_Direction type = EFL_UI_SCROLLBAR_DIRECTION_VERTICAL;
+        Efl_Ui_Layout_Orientation type = EFL_UI_LAYOUT_ORIENTATION_VERTICAL;
         efl_event_callback_call(sd->parent, EFL_UI_SCROLLBAR_EVENT_BAR_HIDE, &type);
      }
 }

diff --git a/src/lib/elementary/efl_ui_scroll_util.c b/src/lib/elementary/efl_ui_scroll_util.c
index 2fcf0e7..68c21ca 100644 (file)
--- a/src/lib/elementary/efl_ui_scroll_util.c
+++ b/src/lib/elementary/efl_ui_scroll_util.c
@@ -95,11 +95,11 @@ _scroll_connector_vbar_drag_cb(void *data,
                           const char *source EINA_UNUSED)
 {
    Scroll_Connector_Context *ctx = data;
-   Efl_Ui_Scrollbar_Direction type;
+   Efl_Ui_Layout_Orientation type;
 
    _scroll_connector_bar_read_and_update(ctx);
 
-   type = EFL_UI_SCROLLBAR_DIRECTION_VERTICAL;
+   type = EFL_UI_LAYOUT_ORIENTATION_VERTICAL;
    efl_event_callback_call(ctx->obj, EFL_UI_SCROLLBAR_EVENT_BAR_DRAG, &type);
 }
 
@@ -110,7 +110,7 @@ _scroll_connector_vbar_press_cb(void *data,
                            const char *source EINA_UNUSED)
 {
    Scroll_Connector_Context *ctx = data;
-   Efl_Ui_Scrollbar_Direction type = EFL_UI_SCROLLBAR_DIRECTION_VERTICAL;
+   Efl_Ui_Layout_Orientation type = EFL_UI_LAYOUT_ORIENTATION_VERTICAL;
 
    efl_event_callback_call(ctx->obj, EFL_UI_SCROLLBAR_EVENT_BAR_PRESS, &type);
 }
@@ -122,7 +122,7 @@ _scroll_connector_vbar_unpress_cb(void *data,
                              const char *source EINA_UNUSED)
 {
    Scroll_Connector_Context *ctx = data;
-   Efl_Ui_Scrollbar_Direction type = EFL_UI_SCROLLBAR_DIRECTION_VERTICAL;
+   Efl_Ui_Layout_Orientation type = EFL_UI_LAYOUT_ORIENTATION_VERTICAL;
 
    efl_event_callback_call(ctx->obj, EFL_UI_SCROLLBAR_EVENT_BAR_UNPRESS, &type);
 }
@@ -134,7 +134,7 @@ _scroll_connector_hbar_drag_cb(void *data,
                           const char *source EINA_UNUSED)
 {
    Scroll_Connector_Context *ctx = data;
-   Efl_Ui_Scrollbar_Direction type = EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL;
+   Efl_Ui_Layout_Orientation type = EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL;
 
    _scroll_connector_bar_read_and_update(ctx);
    efl_event_callback_call(ctx->obj, EFL_UI_SCROLLBAR_EVENT_BAR_DRAG, &type);
@@ -147,7 +147,7 @@ _scroll_connector_hbar_press_cb(void *data,
                            const char *source EINA_UNUSED)
 {
    Scroll_Connector_Context *ctx = data;
-   Efl_Ui_Scrollbar_Direction type = EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL;
+   Efl_Ui_Layout_Orientation type = EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL;
 
    efl_event_callback_call(ctx->obj, EFL_UI_SCROLLBAR_EVENT_BAR_PRESS, &type);
 }
@@ -159,7 +159,7 @@ _scroll_connector_hbar_unpress_cb(void *data,
                              const char *source EINA_UNUSED)
 {
    Scroll_Connector_Context *ctx = data;
-   Efl_Ui_Scrollbar_Direction type = EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL;
+   Efl_Ui_Layout_Orientation type = EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL;
 
    efl_event_callback_call(ctx->obj, EFL_UI_SCROLLBAR_EVENT_BAR_UNPRESS, &type);
 }
@@ -208,11 +208,11 @@ _scroll_connector_bar_show_cb(void *data, const Efl_Event *event)
 {
    Scroll_Connector_Context *ctx = data;
    ELM_WIDGET_DATA_GET_OR_RETURN(ctx->obj, wd);
-   Efl_Ui_Scrollbar_Direction type = *(Efl_Ui_Scrollbar_Direction *)(event->info);
+   Efl_Ui_Layout_Orientation type = *(Efl_Ui_Layout_Orientation *)(event->info);
 
-   if (type == EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL)
+   if (type == EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL)
      efl_layout_signal_emit(wd->resize_obj, "efl,action,show,hbar", "efl");
-   else if (type == EFL_UI_SCROLLBAR_DIRECTION_VERTICAL)
+   else if (type == EFL_UI_LAYOUT_ORIENTATION_VERTICAL)
      efl_layout_signal_emit(wd->resize_obj, "efl,action,show,vbar", "efl");
 }
 
@@ -221,11 +221,11 @@ _scroll_connector_bar_hide_cb(void *data, const Efl_Event *event)
 {
    Scroll_Connector_Context *ctx = data;
    ELM_WIDGET_DATA_GET_OR_RETURN(ctx->obj, wd);
-   Efl_Ui_Scrollbar_Direction type = *(Efl_Ui_Scrollbar_Direction *)(event->info);
+   Efl_Ui_Layout_Orientation type = *(Efl_Ui_Layout_Orientation *)(event->info);
 
-   if (type == EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL)
+   if (type == EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL)
      efl_layout_signal_emit(wd->resize_obj, "efl,action,hide,hbar", "efl");
-   else if (type == EFL_UI_SCROLLBAR_DIRECTION_VERTICAL)
+   else if (type == EFL_UI_LAYOUT_ORIENTATION_VERTICAL)
      efl_layout_signal_emit(wd->resize_obj, "efl,action,hide,vbar", "efl");
 }