hermet pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=092f1919b1bb94d0879a152f5e896bb1001fab8d
commit 092f1919b1bb94d0879a152f5e896bb1001fab8d Author: Hosang Kim <hosang12....@samsung.com> Date: Tue Dec 6 11:31:06 2016 +0900 elm_panel: change panel freeze API when swiping panel. Summary: The panel is freezed by elm_interface_scrollable_movement_block_set(), but elm_interface_scrollable_freeze_set() is used to unfreeze panel. Test Plan: elementar_test -> panel scrollable Reviewers: woohyun, seoz, Hermet, cedric, raster Subscribers: jpeg Differential Revision: https://phab.enlightenment.org/D4458 --- src/lib/elementary/elm_panel.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/lib/elementary/elm_panel.c b/src/lib/elementary/elm_panel.c index a8979ae..662d44d 100644 --- a/src/lib/elementary/elm_panel.c +++ b/src/lib/elementary/elm_panel.c @@ -751,7 +751,8 @@ _on_mouse_move(void *data, case ELM_PANEL_ORIENT_TOP: if (sd->timer && ((cur_y - sd->down_y) > finger_size)) { - elm_interface_scrollable_freeze_set(obj, EINA_FALSE); + elm_interface_scrollable_movement_block_set + (obj, ELM_SCROLLER_MOVEMENT_NO_BLOCK); sd->freeze = EINA_FALSE; elm_layout_signal_emit(sd->scr_ly, "elm,state,content,visible", "elm"); } @@ -759,7 +760,8 @@ _on_mouse_move(void *data, case ELM_PANEL_ORIENT_BOTTOM: if (sd->timer && ((sd->down_y - cur_y) > finger_size)) { - elm_interface_scrollable_freeze_set(obj, EINA_FALSE); + elm_interface_scrollable_movement_block_set + (obj, ELM_SCROLLER_MOVEMENT_NO_BLOCK); sd->freeze = EINA_FALSE; elm_layout_signal_emit(sd->scr_ly, "elm,state,content,visible", "elm"); } @@ -768,7 +770,8 @@ _on_mouse_move(void *data, if ((!is_mirrored && (sd->timer) && ((cur_x - sd->down_x) > finger_size)) || ((is_mirrored) && (sd->timer) && ((sd->down_x - cur_x) > finger_size))) { - elm_interface_scrollable_freeze_set(obj, EINA_FALSE); + elm_interface_scrollable_movement_block_set + (obj, ELM_SCROLLER_MOVEMENT_NO_BLOCK); sd->freeze = EINA_FALSE; elm_layout_signal_emit(sd->scr_ly, "elm,state,content,visible", "elm"); } @@ -777,7 +780,8 @@ _on_mouse_move(void *data, if ((is_mirrored && (sd->timer) && ((cur_x - sd->down_x) > finger_size)) || (!is_mirrored && (sd->timer) && ((sd->down_x - cur_x) > finger_size))) { - elm_interface_scrollable_freeze_set(obj, EINA_FALSE); + elm_interface_scrollable_movement_block_set + (obj, ELM_SCROLLER_MOVEMENT_NO_BLOCK); sd->freeze = EINA_FALSE; elm_layout_signal_emit(sd->scr_ly, "elm,state,content,visible", "elm"); } --