zmike pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=6b3d430f1262f563d940aea52cd7de613a7127c1
commit 6b3d430f1262f563d940aea52cd7de613a7127c1
Author: Yeongjong Lee <yj34....@samsung.com>
Date: Thu Aug 22 08:41:58 2019 -0400
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
---
src/lib/efl/interfaces/efl_ui_scrollbar.eo | 19 +++++++-----------
src/lib/elementary/efl_ui_image_zoomable.c | 32 +++++++++++++++---------------
src/lib/elementary/efl_ui_list_view.c | 24 +++++++++++-----------
src/lib/elementary/efl_ui_scroll_manager.c | 8 ++++----
src/lib/elementary/efl_ui_scroll_util.c | 26 ++++++++++++------------
5 files changed, 52 insertions(+), 57 deletions(-)
diff --git a/src/lib/efl/interfaces/efl_ui_scrollbar.eo
b/src/lib/efl/interfaces/efl_ui_scrollbar.eo
index 46d3aaefb8..ff40310f72 100644
--- 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 92b234782a..c0f1f8d31c 100644
--- a/src/lib/elementary/efl_ui_image_zoomable.c
+++ b/src/lib/elementary/efl_ui_image_zoomable.c
@@ -1389,7 +1389,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);
}
@@ -1399,7 +1399,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);
}
@@ -1409,7 +1409,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);
}
@@ -1459,7 +1459,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);
}
@@ -1469,7 +1469,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);
}
@@ -1479,7 +1479,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);
}
@@ -1534,20 +1534,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");
}
}
@@ -1557,20 +1557,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 96866393a4..25ef87fc94 100644
--- 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 63654f3eba..393f5eef45 100644
--- 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 6468e21bcd..8ae867625f 100644
--- a/src/lib/elementary/efl_ui_scroll_util.c
+++ b/src/lib/elementary/efl_ui_scroll_util.c
@@ -89,11 +89,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);
}
@@ -104,7 +104,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);
}
@@ -116,7 +116,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);
}
@@ -128,7 +128,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);
@@ -141,7 +141,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);
}
@@ -153,7 +153,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);
}
@@ -202,11 +202,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");
}
@@ -215,11 +215,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");
}
--
