enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

api: remove Efl.Ui.Scroll_Block 

Summary:
this now uses layout orient enum everywhere

fix T7921

Reviewers: segfaultxavi

Reviewed By: segfaultxavi

Subscribers: segfaultxavi, cedric, #reviewers, #committers

Tags: #efl

Maniphest Tasks: T7921

Differential Revision: https://phab.enlightenment.org/D9804
This commit is contained in:
Mike Blumenkrantz 2019-09-03 09:06:10 +02:00 committed by Xavi Artigas
parent dc05cbbee8
commit 121a437c4d
13 changed files with 111 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/lib/efl/interfaces/efl_ui_scrollable.eo
View File

@ -1,15 +1,3 @@
enum @beta Efl.Ui.Scroll_Block
{
[[Direction in which a scroller should be blocked.
Note: These options may be effective only in case of thumbscroll (i.e.
when scrolling by dragging).
]]
none = 0, [[Don't block any movement.]]
vertical = 1, [[Block vertical movement.]]
horizontal = 2 [[Block horizontal movement.]]
}
interface @beta Efl.Ui.Scrollable
{
[[Efl UI scrollable interface]]

3
src/lib/efl/interfaces/efl_ui_scrollable_interactive.eo
View File

@ -1,4 +1,5 @@
import eina_types;
import efl_ui_layout_orientable;
interface @beta Efl.Ui.Scrollable_Interactive extends Efl.Ui.Scrollable
{
@ -97,7 +98,7 @@ interface @beta Efl.Ui.Scrollable_Interactive extends Efl.Ui.Scrollable
get {
}
values {
block: Efl.Ui.Scroll_Block(Efl.Ui.Scroll_Block.none); [[Which axis (or axes) to block]]
block: Efl.Ui.Layout_Orientation(Efl.Ui.Layout_Orientation.default); [[Which axis (or axes) to block]]
}
}
@property gravity {

44
src/lib/elementary/efl_ui_panel.c
View File

@ -281,7 +281,7 @@ _drawer_open(Evas_Object *obj, Evas_Coord w, Evas_Coord h, Eina_Bool anim)
if (sd->freeze)
{
efl_ui_scrollable_movement_block_set(obj, EFL_UI_SCROLL_BLOCK_NONE);
efl_ui_scrollable_movement_block_set(obj, EFL_UI_LAYOUT_ORIENTATION_DEFAULT);
sd->freeze = EINA_FALSE;
elm_layout_signal_emit(sd->scr_ly, "efl,state,content,visible", "efl");
}
@ -346,10 +346,10 @@ _drawer_close(Evas_Object *obj, Evas_Coord w, Evas_Coord h, Eina_Bool anim)
{
if (horizontal)
efl_ui_scrollable_movement_block_set
(obj, EFL_UI_SCROLL_BLOCK_HORIZONTAL);
(obj, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL);
else
efl_ui_scrollable_movement_block_set
(obj, EFL_UI_SCROLL_BLOCK_VERTICAL);
(obj, EFL_UI_LAYOUT_ORIENTATION_VERTICAL);
sd->freeze = EINA_TRUE;
elm_layout_signal_emit(sd->scr_ly, "efl,state,content,hidden", "efl");
}
@ -362,7 +362,7 @@ _drawer_close(Evas_Object *obj, Evas_Coord w, Evas_Coord h, Eina_Bool anim)
if (sd->freeze)
{
efl_ui_scrollable_movement_block_set
(obj, EFL_UI_SCROLL_BLOCK_NONE);
(obj, EFL_UI_LAYOUT_ORIENTATION_DEFAULT);
sd->freeze = EINA_FALSE;
elm_layout_signal_emit(sd->scr_ly, "efl,state,content,visible", "efl");
}
@ -375,10 +375,10 @@ _drawer_close(Evas_Object *obj, Evas_Coord w, Evas_Coord h, Eina_Bool anim)
{
if (horizontal)
efl_ui_scrollable_movement_block_set
(obj, EFL_UI_SCROLL_BLOCK_HORIZONTAL);
(obj, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL);
else
efl_ui_scrollable_movement_block_set
(obj, EFL_UI_SCROLL_BLOCK_VERTICAL);
(obj, EFL_UI_LAYOUT_ORIENTATION_VERTICAL);
sd->freeze = EINA_TRUE;
elm_layout_signal_emit(sd->scr_ly, "efl,state,content,hidden", "efl");
}
@ -506,7 +506,7 @@ _timer_cb(void *data)
if (sd->freeze)
{
efl_ui_scrollable_movement_block_set
(obj, EFL_UI_SCROLL_BLOCK_NONE);
(obj, EFL_UI_LAYOUT_ORIENTATION_DEFAULT);
sd->freeze = EINA_FALSE;
elm_layout_signal_emit(sd->scr_ly, "efl,state,content,visible", "efl");
evas_object_geometry_get(obj, NULL, NULL, &w, &h);
@ -614,7 +614,7 @@ _on_mouse_move(void *data,
if (sd->timer && ((cur_y - sd->down_y) > finger_size))
{
efl_ui_scrollable_movement_block_set
(obj, EFL_UI_SCROLL_BLOCK_NONE);
(obj, EFL_UI_LAYOUT_ORIENTATION_DEFAULT);
sd->freeze = EINA_FALSE;
elm_layout_signal_emit(sd->scr_ly, "efl,state,content,visible", "efl");
}
@ -623,7 +623,7 @@ _on_mouse_move(void *data,
if (sd->timer && ((sd->down_y - cur_y) > finger_size))
{
efl_ui_scrollable_movement_block_set
(obj, EFL_UI_SCROLL_BLOCK_NONE);
(obj, EFL_UI_LAYOUT_ORIENTATION_DEFAULT);
sd->freeze = EINA_FALSE;
elm_layout_signal_emit(sd->scr_ly, "efl,state,content,visible", "efl");
}
@ -633,7 +633,7 @@ _on_mouse_move(void *data,
((is_mirrored) && (sd->timer) && ((sd->down_x - cur_x) > finger_size)))
{
efl_ui_scrollable_movement_block_set
(obj, EFL_UI_SCROLL_BLOCK_NONE);
(obj, EFL_UI_LAYOUT_ORIENTATION_DEFAULT);
sd->freeze = EINA_FALSE;
elm_layout_signal_emit(sd->scr_ly, "efl,state,content,visible", "efl");
}
@ -643,7 +643,7 @@ _on_mouse_move(void *data,
(!is_mirrored && (sd->timer) && ((sd->down_x - cur_x) > finger_size)))
{
efl_ui_scrollable_movement_block_set
(obj, EFL_UI_SCROLL_BLOCK_NONE);
(obj, EFL_UI_LAYOUT_ORIENTATION_DEFAULT);
sd->freeze = EINA_FALSE;
elm_layout_signal_emit(sd->scr_ly, "efl,state,content,visible", "efl");
}
@ -910,12 +910,12 @@ _efl_ui_panel_orient_set(Eo *obj, Efl_Ui_Panel_Data *sd, Efl_Ui_Panel_Orient ori
case EFL_UI_PANEL_ORIENT_TOP:
case EFL_UI_PANEL_ORIENT_BOTTOM:
efl_ui_scrollable_movement_block_set
(obj, EFL_UI_SCROLL_BLOCK_VERTICAL);
(obj, EFL_UI_LAYOUT_ORIENTATION_VERTICAL);
break;
case EFL_UI_PANEL_ORIENT_LEFT:
case EFL_UI_PANEL_ORIENT_RIGHT:
efl_ui_scrollable_movement_block_set
(obj, EFL_UI_SCROLL_BLOCK_HORIZONTAL);
(obj, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL);
break;
}
@ -1059,10 +1059,10 @@ _anim_stop_cb(void *data EINA_UNUSED, const Efl_Event *event)
{
if (horizontal)
efl_ui_scrollable_movement_block_set
(obj, EFL_UI_SCROLL_BLOCK_HORIZONTAL);
(obj, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL);
else
efl_ui_scrollable_movement_block_set
(obj, EFL_UI_SCROLL_BLOCK_VERTICAL);
(obj, EFL_UI_LAYOUT_ORIENTATION_VERTICAL);
sd->freeze = EINA_TRUE;
elm_layout_signal_emit(sd->scr_ly, "efl,state,content,hidden", "efl");
@ -1088,7 +1088,7 @@ _scroll_cb(void *data EINA_UNUSED, const Efl_Event *event_info EINA_UNUSED)
if (sd->freeze)
{
efl_ui_scrollable_movement_block_set
(obj, EFL_UI_SCROLL_BLOCK_NONE);
(obj, EFL_UI_LAYOUT_ORIENTATION_DEFAULT);
sd->freeze = EINA_FALSE;
elm_layout_signal_emit(sd->scr_ly, "efl,state,content,visible", "efl");
}
@ -1108,13 +1108,13 @@ _efl_ui_panel_efl_ui_widget_disabled_set(Eo *obj, Efl_Ui_Panel_Data *sd, Eina_Bo
case ELM_PANEL_ORIENT_BOTTOM:
case ELM_PANEL_ORIENT_TOP:
efl_ui_scrollable_movement_block_set
(obj, EFL_UI_SCROLL_BLOCK_VERTICAL);
(obj, EFL_UI_LAYOUT_ORIENTATION_VERTICAL);
break;
case ELM_PANEL_ORIENT_RIGHT:
case ELM_PANEL_ORIENT_LEFT:
efl_ui_scrollable_movement_block_set
(obj, EFL_UI_SCROLL_BLOCK_HORIZONTAL);
(obj, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL);
break;
}
@ -1136,13 +1136,13 @@ _efl_ui_panel_efl_ui_widget_disabled_set(Eo *obj, Efl_Ui_Panel_Data *sd, Eina_Bo
case ELM_PANEL_ORIENT_BOTTOM:
case ELM_PANEL_ORIENT_TOP:
efl_ui_scrollable_movement_block_set
(obj, EFL_UI_SCROLL_BLOCK_HORIZONTAL);
(obj, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL);
break;
case ELM_PANEL_ORIENT_RIGHT:
case ELM_PANEL_ORIENT_LEFT:
efl_ui_scrollable_movement_block_set
(obj, EFL_UI_SCROLL_BLOCK_VERTICAL);
(obj, EFL_UI_LAYOUT_ORIENTATION_VERTICAL);
break;
}
@ -1275,12 +1275,12 @@ _efl_ui_panel_scrollable_set(Eo *obj, Efl_Ui_Panel_Data *sd, Eina_Bool scrollabl
case EFL_UI_PANEL_ORIENT_TOP:
case EFL_UI_PANEL_ORIENT_BOTTOM:
efl_ui_scrollable_movement_block_set
(obj, EFL_UI_SCROLL_BLOCK_VERTICAL);
(obj, EFL_UI_LAYOUT_ORIENTATION_VERTICAL);
break;
case EFL_UI_PANEL_ORIENT_LEFT:
case EFL_UI_PANEL_ORIENT_RIGHT:
efl_ui_scrollable_movement_block_set
(obj, EFL_UI_SCROLL_BLOCK_HORIZONTAL);
(obj, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL);
break;
}

18
src/lib/elementary/efl_ui_scroll_manager.c
View File

@ -137,8 +137,8 @@ static inline Eina_Bool
_scroll_manager_thumb_scrollable_get(Efl_Ui_Scroll_Manager_Data *sd)
{
if (!sd) return EINA_FALSE;
if ((sd->block & EFL_UI_SCROLL_BLOCK_VERTICAL) &&
(sd->block & EFL_UI_SCROLL_BLOCK_HORIZONTAL))
if ((sd->block & EFL_UI_LAYOUT_ORIENTATION_VERTICAL) &&
(sd->block & EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL))
return EINA_FALSE;
if (!_elm_config->thumbscroll_enable) return EINA_FALSE;
@ -898,11 +898,11 @@ _efl_ui_scroll_manager_wheel_event_cb(void *data,
return;
if (direction)
{
if (sd->block & EFL_UI_SCROLL_BLOCK_HORIZONTAL) return;
if (sd->block & EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL) return;
}
else
{
if (sd->block & EFL_UI_SCROLL_BLOCK_VERTICAL) return;
if (sd->block & EFL_UI_LAYOUT_ORIENTATION_VERTICAL) return;
}
evas_post_event_callback_push(e, _scroll_wheel_post_event_cb, sd);
@ -1641,10 +1641,10 @@ _efl_ui_scroll_manager_post_event_move_direction_restrict_eval(Efl_Ui_Scroll_Man
else if (dy < 0)
sd->down.vdir = DOWN;
if (!(sd->block & EFL_UI_SCROLL_BLOCK_HORIZONTAL))
if (!(sd->block & EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL))
sd->down.dir_x = EINA_TRUE;
if (!(sd->block & EFL_UI_SCROLL_BLOCK_VERTICAL))
if (!(sd->block & EFL_UI_LAYOUT_ORIENTATION_VERTICAL))
sd->down.dir_y = EINA_TRUE;
return EINA_TRUE;
@ -2390,12 +2390,12 @@ _efl_ui_scroll_manager_efl_ui_scrollable_interactive_gravity_get(const Eo *obj E
}
EOLIAN static void
_efl_ui_scroll_manager_efl_ui_scrollable_interactive_movement_block_set(Eo *obj EINA_UNUSED, Efl_Ui_Scroll_Manager_Data *sd, Efl_Ui_Scroll_Block block)
_efl_ui_scroll_manager_efl_ui_scrollable_interactive_movement_block_set(Eo *obj EINA_UNUSED, Efl_Ui_Scroll_Manager_Data *sd, Efl_Ui_Layout_Orientation block)
{
sd->block = block;
}
EOLIAN static Efl_Ui_Scroll_Block
EOLIAN static Efl_Ui_Layout_Orientation
_efl_ui_scroll_manager_efl_ui_scrollable_interactive_movement_block_get(const Eo *obj EINA_UNUSED, Efl_Ui_Scroll_Manager_Data *sd)
{
return sd->block;
@ -2443,7 +2443,7 @@ _efl_ui_scroll_manager_efl_object_constructor(Eo *obj, Efl_Ui_Scroll_Manager_Dat
sd->bounce_horiz = _elm_config->thumbscroll_bounce_enable;
sd->bounce_vert = _elm_config->thumbscroll_bounce_enable;
sd->block = EFL_UI_SCROLL_BLOCK_NONE;
sd->block = EFL_UI_LAYOUT_ORIENTATION_DEFAULT;
sd->scrolling = EINA_FALSE;
sd->event_rect = evas_object_rectangle_add(evas_object_evas_get(sd->parent));

14
src/lib/elementary/efl_ui_widget.c
View File

@ -2653,14 +2653,14 @@ elm_widget_cursor_del(Eo *obj, Elm_Cursor *cur)
}
EAPI void
elm_widget_scroll_lock_set(Eo *obj, Efl_Ui_Scroll_Block block)
elm_widget_scroll_lock_set(Eo *obj, Efl_Ui_Layout_Orientation block)
{
Elm_Widget_Smart_Data *sd = efl_data_scope_safe_get(obj, MY_CLASS);
Eina_Bool lx, ly;
if (!sd) return;
lx = !!(block & EFL_UI_SCROLL_BLOCK_HORIZONTAL);
ly = !!(block & EFL_UI_SCROLL_BLOCK_VERTICAL);
lx = !!(block & EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL);
ly = !!(block & EFL_UI_LAYOUT_ORIENTATION_VERTICAL);
if (sd->scroll_x_locked != lx)
{
sd->scroll_x_locked = lx;
@ -2673,15 +2673,15 @@ elm_widget_scroll_lock_set(Eo *obj, Efl_Ui_Scroll_Block block)
}
}
EAPI Efl_Ui_Scroll_Block
EAPI Efl_Ui_Layout_Orientation
elm_widget_scroll_lock_get(const Eo *obj)
{
Elm_Widget_Smart_Data *sd = efl_data_scope_safe_get(obj, MY_CLASS);
Efl_Ui_Scroll_Block block = EFL_UI_SCROLL_BLOCK_NONE;
Efl_Ui_Layout_Orientation block = EFL_UI_LAYOUT_ORIENTATION_DEFAULT;
if (!sd) return block;
if (sd->scroll_x_locked) block |= EFL_UI_SCROLL_BLOCK_HORIZONTAL;
if (sd->scroll_y_locked) block |= EFL_UI_SCROLL_BLOCK_VERTICAL;
if (sd->scroll_x_locked) block |= EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL;
if (sd->scroll_y_locked) block |= EFL_UI_LAYOUT_ORIENTATION_VERTICAL;
return block;
}

2
src/lib/elementary/efl_ui_widget_scroll_manager.h
View File

@ -25,7 +25,7 @@ typedef struct _Efl_Ui_Scroll_Manager_Data
Efl_Ui_Scrollbar_Mode hbar_mode, vbar_mode;
Ecore_Timer *hbar_timer, *vbar_timer;
Efl_Ui_Scroll_Block block;
Efl_Ui_Layout_Orientation block;
struct
{

54
src/lib/elementary/elm_interface_scrollable.c
View File

@ -2239,11 +2239,11 @@ _elm_scroll_wheel_event_cb(void *data,
return;
if (direction)
{
if (sid->block & EFL_UI_SCROLL_BLOCK_HORIZONTAL) return;
if (sid->block & EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL) return;
}
else
{
if (sid->block & EFL_UI_SCROLL_BLOCK_VERTICAL) return;
if (sid->block & EFL_UI_LAYOUT_ORIENTATION_VERTICAL) return;
}
evas_post_event_callback_push(e, _scroll_wheel_post_event_cb, sid);
@ -2257,7 +2257,7 @@ _elm_scroll_post_event_up(void *data,
if (sid->obj)
{
elm_widget_scroll_lock_set(sid->obj, EFL_UI_SCROLL_BLOCK_NONE);
elm_widget_scroll_lock_set(sid->obj, EFL_UI_LAYOUT_ORIENTATION_DEFAULT);
}
return EINA_TRUE;
}
@ -2721,8 +2721,8 @@ _elm_scroll_mouse_up_event_cb(void *data,
if (!sid->pan_obj) return;
if ((sid->block & EFL_UI_SCROLL_BLOCK_VERTICAL) &&
(sid->block & EFL_UI_SCROLL_BLOCK_HORIZONTAL))
if ((sid->block & EFL_UI_LAYOUT_ORIENTATION_VERTICAL) &&
(sid->block & EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL))
return;
#ifdef SMOOTHDBG
@ -2871,7 +2871,7 @@ _elm_scroll_mouse_up_event_cb(void *data,
pgx = _elm_scroll_page_x_get(sid, ox, EINA_TRUE);
if (pgx != x &&
!(sid->block &
EFL_UI_SCROLL_BLOCK_HORIZONTAL))
EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL))
{
ev->event_flags |= EVAS_EVENT_FLAG_ON_SCROLL;
_elm_scroll_scroll_to_x
@ -2885,7 +2885,7 @@ _elm_scroll_mouse_up_event_cb(void *data,
pgy = _elm_scroll_page_y_get(sid, oy, EINA_TRUE);
if (pgy != y &&
!(sid->block &
EFL_UI_SCROLL_BLOCK_VERTICAL))
EFL_UI_LAYOUT_ORIENTATION_VERTICAL))
{
ev->event_flags |= EVAS_EVENT_FLAG_ON_SCROLL;
_elm_scroll_scroll_to_y
@ -2972,8 +2972,8 @@ _elm_scroll_mouse_down_event_cb(void *data,
sid = data;
ev = event_info;
if ((sid->block & EFL_UI_SCROLL_BLOCK_VERTICAL) &&
(sid->block & EFL_UI_SCROLL_BLOCK_HORIZONTAL))
if ((sid->block & EFL_UI_LAYOUT_ORIENTATION_VERTICAL) &&
(sid->block & EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL))
return;
#ifdef SMOOTHDBG
@ -3122,7 +3122,7 @@ _elm_scroll_post_event_move(void *data,
Evas *e EINA_UNUSED)
{
Elm_Scrollable_Smart_Interface_Data *sid = data;
Efl_Ui_Scroll_Block block;
Efl_Ui_Layout_Orientation block;
Eina_Bool horiz, vert;
int start = 0;
@ -3155,7 +3155,7 @@ _elm_scroll_post_event_move(void *data,
sid->down.dragged = EINA_TRUE;
if (sid->obj)
{
block |= EFL_UI_SCROLL_BLOCK_HORIZONTAL;
block |= EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL;
elm_widget_scroll_lock_set(sid->obj, block);
}
start = 1;
@ -3178,7 +3178,7 @@ _elm_scroll_post_event_move(void *data,
sid->down.dragged = EINA_TRUE;
if (sid->obj)
{
block |= EFL_UI_SCROLL_BLOCK_VERTICAL;
block |= EFL_UI_LAYOUT_ORIENTATION_VERTICAL;
elm_widget_scroll_lock_set(sid->obj, block);
}
start = 1;
@ -3433,8 +3433,8 @@ _elm_scroll_mouse_move_event_cb(void *data,
if (!sid->pan_obj) return;
if ((sid->block & EFL_UI_SCROLL_BLOCK_VERTICAL) &&
(sid->block & EFL_UI_SCROLL_BLOCK_HORIZONTAL))
if ((sid->block & EFL_UI_LAYOUT_ORIENTATION_VERTICAL) &&
(sid->block & EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL))
return;
ev = event_info;
@ -3449,7 +3449,7 @@ _elm_scroll_mouse_move_event_cb(void *data,
if (!sid->down.now) return;
if ((sid->scrollto.x.animator) && (!sid->hold) && (!sid->freeze) &&
!(sid->block & EFL_UI_SCROLL_BLOCK_HORIZONTAL))
!(sid->block & EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL))
{
Evas_Coord px = 0;
ELM_ANIMATOR_DISCONNECT(sid->obj, sid->scrollto.x.animator, _elm_scroll_scroll_to_x_animator, sid);
@ -3459,7 +3459,7 @@ _elm_scroll_mouse_move_event_cb(void *data,
}
if ((sid->scrollto.y.animator) && (!sid->hold) && (!sid->freeze) &&
!(sid->block & EFL_UI_SCROLL_BLOCK_VERTICAL))
!(sid->block & EFL_UI_LAYOUT_ORIENTATION_VERTICAL))
{
Evas_Coord py = 0;
ELM_ANIMATOR_DISCONNECT(sid->obj, sid->scrollto.y.animator, _elm_scroll_scroll_to_y_animator, sid);
@ -3508,7 +3508,7 @@ _elm_scroll_mouse_move_event_cb(void *data,
if (x > (y * 2))
{
if (!(sid->block &
EFL_UI_SCROLL_BLOCK_HORIZONTAL))
EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL))
{
sid->down.dir_x = EINA_TRUE;
}
@ -3519,7 +3519,7 @@ _elm_scroll_mouse_move_event_cb(void *data,
{
sid->down.dir_x = EINA_FALSE;
if (!(sid->block &
EFL_UI_SCROLL_BLOCK_VERTICAL))
EFL_UI_LAYOUT_ORIENTATION_VERTICAL))
{
sid->down.dir_y = EINA_TRUE;
}
@ -3528,12 +3528,12 @@ _elm_scroll_mouse_move_event_cb(void *data,
if (!dodir)
{
if (!(sid->block &
EFL_UI_SCROLL_BLOCK_HORIZONTAL))
EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL))
{
sid->down.dir_x = EINA_TRUE;
}
if (!(sid->block &
EFL_UI_SCROLL_BLOCK_VERTICAL))
EFL_UI_LAYOUT_ORIENTATION_VERTICAL))
{
sid->down.dir_y = EINA_TRUE;
}
@ -3545,7 +3545,7 @@ _elm_scroll_mouse_move_event_cb(void *data,
if (x > y)
{
if (!(sid->block &
EFL_UI_SCROLL_BLOCK_HORIZONTAL))
EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL))
{
sid->down.dir_x = EINA_TRUE;
}
@ -3555,7 +3555,7 @@ _elm_scroll_mouse_move_event_cb(void *data,
{
sid->down.dir_x = EINA_FALSE;
if (!(sid->block &
EFL_UI_SCROLL_BLOCK_VERTICAL))
EFL_UI_LAYOUT_ORIENTATION_VERTICAL))
{
sid->down.dir_y = EINA_TRUE;
}
@ -3566,12 +3566,12 @@ _elm_scroll_mouse_move_event_cb(void *data,
else
{
if (!(sid->block &
EFL_UI_SCROLL_BLOCK_HORIZONTAL))
EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL))
{
sid->down.dir_x = EINA_TRUE;
}
if (!(sid->block &
EFL_UI_SCROLL_BLOCK_VERTICAL))
EFL_UI_LAYOUT_ORIENTATION_VERTICAL))
{
sid->down.dir_y = EINA_TRUE;
}
@ -4792,12 +4792,12 @@ _elm_interface_scrollable_gravity_get(const Eo *obj EINA_UNUSED, Elm_Scrollable_
}
EOLIAN static void
_elm_interface_scrollable_movement_block_set(Eo *obj EINA_UNUSED, Elm_Scrollable_Smart_Interface_Data *sid, Efl_Ui_Scroll_Block block)
_elm_interface_scrollable_movement_block_set(Eo *obj EINA_UNUSED, Elm_Scrollable_Smart_Interface_Data *sid, Efl_Ui_Layout_Orientation block)
{
sid->block = block;
}
EOLIAN static Efl_Ui_Scroll_Block
EOLIAN static Efl_Ui_Layout_Orientation
_elm_interface_scrollable_movement_block_get(const Eo *obj EINA_UNUSED, Elm_Scrollable_Smart_Interface_Data *sid)
{
return sid->block;
@ -4859,7 +4859,7 @@ _elm_interface_scrollable_efl_canvas_group_group_add(Eo *obj, Elm_Scrollable_Sma
sid->one_direction_at_a_time = ELM_SCROLLER_SINGLE_DIRECTION_SOFT;
sid->momentum_animator_disabled = EINA_FALSE;
sid->bounce_animator_disabled = EINA_FALSE;
sid->block = EFL_UI_SCROLL_BLOCK_NONE;
sid->block = EFL_UI_LAYOUT_ORIENTATION_DEFAULT;
_elm_scroll_scroll_bar_reset(sid);

3
src/lib/elementary/elm_interface_scrollable.eo
View File

@ -1,3 +1,4 @@
import efl_ui_layout_orientable;
type @beta Elm_Interface_Scrollable_Cb: __undefined_type; [[Elementary interface scrollable callback type]]
type @beta Elm_Interface_Scrollable_Resize_Cb: __undefined_type; [[Elementary interface scrollable resize callback type]]
type @beta Elm_Interface_Scrollable_Min_Limit_Cb: __undefined_type; [[Elementary interface scrollable minimal limit callback type]]
@ -99,7 +100,7 @@ mixin @beta Elm.Interface_Scrollable requires Efl.Ui.Widget extends Efl.Ui.Scrol
with regard to scrolling.
]]
values {
block: Efl.Ui.Scroll_Block(Efl.Ui.Scroll_Block.none); [[Which axis (or axes) to block]]
block: Efl.Ui.Layout_Orientation(Efl.Ui.Layout_Orientation.default); [[Which axis (or axes) to block]]
}
}
@property momentum_animator_disabled {

2
src/lib/elementary/elm_interface_scrollable.h
View File

@ -75,7 +75,7 @@ struct _Elm_Scrollable_Smart_Interface_Data
Elm_Scroller_Policy hbar_flags, vbar_flags;
Elm_Scroller_Single_Direction one_direction_at_a_time;
Efl_Ui_Scroll_Block block;
Efl_Ui_Layout_Orientation block;
struct
{

20
src/lib/elementary/elm_main.c
View File

@ -1790,12 +1790,12 @@ EAPI void
elm_object_scroll_lock_x_set(Evas_Object *obj,
Eina_Bool lock)
{
Efl_Ui_Scroll_Block block;
Efl_Ui_Layout_Orientation block;
EINA_SAFETY_ON_NULL_RETURN(obj);
block = elm_widget_scroll_lock_get(obj);
if (lock) block |= EFL_UI_SCROLL_BLOCK_HORIZONTAL;
else block &= ~EFL_UI_SCROLL_BLOCK_HORIZONTAL;
if (lock) block |= EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL;
else block &= ~EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL;
elm_widget_scroll_lock_set(obj, block);
}
@ -1803,33 +1803,33 @@ EAPI void
elm_object_scroll_lock_y_set(Evas_Object *obj,
Eina_Bool lock)
{
Efl_Ui_Scroll_Block block;
Efl_Ui_Layout_Orientation block;
EINA_SAFETY_ON_NULL_RETURN(obj);
block = elm_widget_scroll_lock_get(obj);
if (lock) block |= EFL_UI_SCROLL_BLOCK_VERTICAL;
else block &= ~EFL_UI_SCROLL_BLOCK_VERTICAL;
if (lock) block |= EFL_UI_LAYOUT_ORIENTATION_VERTICAL;
else block &= ~EFL_UI_LAYOUT_ORIENTATION_VERTICAL;
elm_widget_scroll_lock_set(obj, block);
}
EAPI Eina_Bool
elm_object_scroll_lock_x_get(const Evas_Object *obj)
{
Efl_Ui_Scroll_Block block;
Efl_Ui_Layout_Orientation block;
EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EINA_FALSE);
block = elm_widget_scroll_lock_get(obj);
return !!(block & EFL_UI_SCROLL_BLOCK_HORIZONTAL);
return !!(block & EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL);
}
EAPI Eina_Bool
elm_object_scroll_lock_y_get(const Evas_Object *obj)
{
Efl_Ui_Scroll_Block block;
Efl_Ui_Layout_Orientation block;
EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EINA_FALSE);
block = elm_widget_scroll_lock_get(obj);
return !!(block & EFL_UI_SCROLL_BLOCK_VERTICAL);
return !!(block & EFL_UI_LAYOUT_ORIENTATION_VERTICAL);
}
EAPI void

44
src/lib/elementary/elm_panel.c
View File

@ -305,7 +305,7 @@ _drawer_open(Evas_Object *obj, Evas_Coord w, Evas_Coord h, Eina_Bool anim)
if (sd->freeze)
{
elm_interface_scrollable_movement_block_set
(obj, EFL_UI_SCROLL_BLOCK_NONE);
(obj, EFL_UI_LAYOUT_ORIENTATION_DEFAULT);
sd->freeze = EINA_FALSE;
elm_layout_signal_emit(sd->scr_ly, "elm,state,content,visible", "elm");
}
@ -374,10 +374,10 @@ _drawer_close(Evas_Object *obj, Evas_Coord w, Evas_Coord h, Eina_Bool anim)
{
if (horizontal)
elm_interface_scrollable_movement_block_set
(obj, EFL_UI_SCROLL_BLOCK_HORIZONTAL);
(obj, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL);
else
elm_interface_scrollable_movement_block_set
(obj, EFL_UI_SCROLL_BLOCK_VERTICAL);
(obj, EFL_UI_LAYOUT_ORIENTATION_VERTICAL);
sd->freeze = EINA_TRUE;
elm_layout_signal_emit(sd->scr_ly, "elm,state,content,hidden", "elm");
}
@ -390,7 +390,7 @@ _drawer_close(Evas_Object *obj, Evas_Coord w, Evas_Coord h, Eina_Bool anim)
if (sd->freeze)
{
elm_interface_scrollable_movement_block_set
(obj, EFL_UI_SCROLL_BLOCK_NONE);
(obj, EFL_UI_LAYOUT_ORIENTATION_DEFAULT);
sd->freeze = EINA_FALSE;
elm_layout_signal_emit(sd->scr_ly, "elm,state,content,visible", "elm");
}
@ -403,10 +403,10 @@ _drawer_close(Evas_Object *obj, Evas_Coord w, Evas_Coord h, Eina_Bool anim)
{
if (horizontal)
elm_interface_scrollable_movement_block_set
(obj, EFL_UI_SCROLL_BLOCK_HORIZONTAL);
(obj, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL);
else
elm_interface_scrollable_movement_block_set
(obj, EFL_UI_SCROLL_BLOCK_VERTICAL);
(obj, EFL_UI_LAYOUT_ORIENTATION_VERTICAL);
sd->freeze = EINA_TRUE;
elm_layout_signal_emit(sd->scr_ly, "elm,state,content,hidden", "elm");
}
@ -531,7 +531,7 @@ _timer_cb(void *data)
if (sd->freeze)
{
elm_interface_scrollable_movement_block_set
(obj, EFL_UI_SCROLL_BLOCK_NONE);
(obj, EFL_UI_LAYOUT_ORIENTATION_DEFAULT);
sd->freeze = EINA_FALSE;
elm_layout_signal_emit(sd->scr_ly, "elm,state,content,visible", "elm");
evas_object_geometry_get(obj, NULL, NULL, &w, &h);
@ -639,7 +639,7 @@ _on_mouse_move(void *data,
if (sd->timer && ((cur_y - sd->down_y) > finger_size))
{
elm_interface_scrollable_movement_block_set
(obj, EFL_UI_SCROLL_BLOCK_NONE);
(obj, EFL_UI_LAYOUT_ORIENTATION_DEFAULT);
sd->freeze = EINA_FALSE;
elm_layout_signal_emit(sd->scr_ly, "elm,state,content,visible", "elm");
}
@ -648,7 +648,7 @@ _on_mouse_move(void *data,
if (sd->timer && ((sd->down_y - cur_y) > finger_size))
{
elm_interface_scrollable_movement_block_set
(obj, EFL_UI_SCROLL_BLOCK_NONE);
(obj, EFL_UI_LAYOUT_ORIENTATION_DEFAULT);
sd->freeze = EINA_FALSE;
elm_layout_signal_emit(sd->scr_ly, "elm,state,content,visible", "elm");
}
@ -658,7 +658,7 @@ _on_mouse_move(void *data,
((is_mirrored) && (sd->timer) && ((sd->down_x - cur_x) > finger_size)))
{
elm_interface_scrollable_movement_block_set
(obj, EFL_UI_SCROLL_BLOCK_NONE);
(obj, EFL_UI_LAYOUT_ORIENTATION_DEFAULT);
sd->freeze = EINA_FALSE;
elm_layout_signal_emit(sd->scr_ly, "elm,state,content,visible", "elm");
}
@ -668,7 +668,7 @@ _on_mouse_move(void *data,
(!is_mirrored && (sd->timer) && ((sd->down_x - cur_x) > finger_size)))
{
elm_interface_scrollable_movement_block_set
(obj, EFL_UI_SCROLL_BLOCK_NONE);
(obj, EFL_UI_LAYOUT_ORIENTATION_DEFAULT);
sd->freeze = EINA_FALSE;
elm_layout_signal_emit(sd->scr_ly, "elm,state,content,visible", "elm");
}
@ -1009,12 +1009,12 @@ _elm_panel_orient_set(Eo *obj, Elm_Panel_Data *sd, Elm_Panel_Orient orient)
case ELM_PANEL_ORIENT_TOP:
case ELM_PANEL_ORIENT_BOTTOM:
elm_interface_scrollable_movement_block_set
(obj, EFL_UI_SCROLL_BLOCK_VERTICAL);
(obj, EFL_UI_LAYOUT_ORIENTATION_VERTICAL);
break;
case ELM_PANEL_ORIENT_LEFT:
case ELM_PANEL_ORIENT_RIGHT:
elm_interface_scrollable_movement_block_set
(obj, EFL_UI_SCROLL_BLOCK_HORIZONTAL);
(obj, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL);
break;
}
@ -1156,10 +1156,10 @@ _anim_stop_cb(Evas_Object *obj, void *data EINA_UNUSED)
{
if (horizontal)
elm_interface_scrollable_movement_block_set
(obj, EFL_UI_SCROLL_BLOCK_HORIZONTAL);
(obj, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL);
else
elm_interface_scrollable_movement_block_set
(obj, EFL_UI_SCROLL_BLOCK_VERTICAL);
(obj, EFL_UI_LAYOUT_ORIENTATION_VERTICAL);
sd->freeze = EINA_TRUE;
elm_layout_signal_emit(sd->scr_ly, "elm,state,content,hidden", "elm");
@ -1189,7 +1189,7 @@ _scroll_cb(Evas_Object *obj, void *data EINA_UNUSED)
if (sd->freeze)
{
elm_interface_scrollable_movement_block_set
(obj, EFL_UI_SCROLL_BLOCK_NONE);
(obj, EFL_UI_LAYOUT_ORIENTATION_DEFAULT);
sd->freeze = EINA_FALSE;
elm_layout_signal_emit(sd->scr_ly, "elm,state,content,visible", "elm");
}
@ -1250,13 +1250,13 @@ _elm_panel_efl_ui_widget_disabled_set(Eo *obj, Elm_Panel_Data *sd, Eina_Bool dis
case ELM_PANEL_ORIENT_BOTTOM:
case ELM_PANEL_ORIENT_TOP:
elm_interface_scrollable_movement_block_set
(obj, EFL_UI_SCROLL_BLOCK_VERTICAL);
(obj, EFL_UI_LAYOUT_ORIENTATION_VERTICAL);
break;
case ELM_PANEL_ORIENT_RIGHT:
case ELM_PANEL_ORIENT_LEFT:
elm_interface_scrollable_movement_block_set
(obj, EFL_UI_SCROLL_BLOCK_HORIZONTAL);
(obj, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL);
break;
}
@ -1278,13 +1278,13 @@ _elm_panel_efl_ui_widget_disabled_set(Eo *obj, Elm_Panel_Data *sd, Eina_Bool dis
case ELM_PANEL_ORIENT_BOTTOM:
case ELM_PANEL_ORIENT_TOP:
elm_interface_scrollable_movement_block_set
(obj, EFL_UI_SCROLL_BLOCK_HORIZONTAL);
(obj, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL);
break;
case ELM_PANEL_ORIENT_RIGHT:
case ELM_PANEL_ORIENT_LEFT:
elm_interface_scrollable_movement_block_set
(obj, EFL_UI_SCROLL_BLOCK_VERTICAL);
(obj, EFL_UI_LAYOUT_ORIENTATION_VERTICAL);
break;
}
@ -1413,12 +1413,12 @@ _elm_panel_scrollable_set(Eo *obj, Elm_Panel_Data *sd, Eina_Bool scrollable)
case ELM_PANEL_ORIENT_TOP:
case ELM_PANEL_ORIENT_BOTTOM:
elm_interface_scrollable_movement_block_set
(obj, EFL_UI_SCROLL_BLOCK_VERTICAL);
(obj, EFL_UI_LAYOUT_ORIENTATION_VERTICAL);
break;
case ELM_PANEL_ORIENT_LEFT:
case ELM_PANEL_ORIENT_RIGHT:
elm_interface_scrollable_movement_block_set
(obj, EFL_UI_SCROLL_BLOCK_HORIZONTAL);
(obj, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL);
break;
}
}

12
src/lib/elementary/elm_scroller.c
View File

@ -1208,13 +1208,13 @@ elm_scroller_movement_block_set(Evas_Object *obj,
Elm_Scroller_Movement_Block block)
{
ELM_SCROLLABLE_CHECK(obj);
Efl_Ui_Scroll_Block mode = EFL_UI_SCROLL_BLOCK_NONE;
Efl_Ui_Layout_Orientation mode = EFL_UI_LAYOUT_ORIENTATION_DEFAULT;
// legacy -> eo
if (block == ELM_SCROLLER_MOVEMENT_BLOCK_HORIZONTAL)
mode = EFL_UI_SCROLL_BLOCK_HORIZONTAL;
mode = EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL;
else if (block == ELM_SCROLLER_MOVEMENT_BLOCK_VERTICAL)
mode = EFL_UI_SCROLL_BLOCK_VERTICAL;
mode = EFL_UI_LAYOUT_ORIENTATION_VERTICAL;
elm_interface_scrollable_movement_block_set(obj, mode);
}
@ -1222,16 +1222,16 @@ elm_scroller_movement_block_set(Evas_Object *obj,
EAPI Elm_Scroller_Movement_Block
elm_scroller_movement_block_get(const Evas_Object *obj)
{
Efl_Ui_Scroll_Block mode;
Efl_Ui_Layout_Orientation mode;
ELM_SCROLLABLE_CHECK(obj, ELM_SCROLLER_MOVEMENT_NO_BLOCK);
mode = elm_interface_scrollable_movement_block_get(obj);
// eo -> legacy
if (mode == EFL_UI_SCROLL_BLOCK_HORIZONTAL)
if (mode == EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL)
return ELM_SCROLLER_MOVEMENT_BLOCK_HORIZONTAL;
else if (mode == EFL_UI_SCROLL_BLOCK_VERTICAL)
else if (mode == EFL_UI_LAYOUT_ORIENTATION_VERTICAL)
return ELM_SCROLLER_MOVEMENT_BLOCK_VERTICAL;
return ELM_SCROLLER_MOVEMENT_NO_BLOCK;

4
src/lib/elementary/elm_widget.h
View File

@ -660,8 +660,8 @@ EAPI void elm_widget_tooltip_add(Evas_Object *obj, Elm_Tooltip *tt);
EAPI void elm_widget_tooltip_del(Evas_Object *obj, Elm_Tooltip *tt);
EAPI void elm_widget_cursor_add(Evas_Object *obj, Elm_Cursor *cur);
EAPI void elm_widget_cursor_del(Evas_Object *obj, Elm_Cursor *cur);
EAPI void elm_widget_scroll_lock_set(Evas_Object *obj, Efl_Ui_Scroll_Block block);
EAPI Efl_Ui_Scroll_Block elm_widget_scroll_lock_get(const Evas_Object *obj);
EAPI void elm_widget_scroll_lock_set(Evas_Object *obj, Efl_Ui_Layout_Orientation block);
EAPI Efl_Ui_Layout_Orientation elm_widget_scroll_lock_get(const Evas_Object *obj);
EAPI int elm_widget_scroll_child_locked_x_get(const Evas_Object *obj);
EAPI int elm_widget_scroll_child_locked_y_get(const Evas_Object *obj);
EAPI Eina_Error elm_widget_theme_object_set(Evas_Object *obj, Evas_Object *edj, const char *wname, const char *welement, const char *wstyle);