kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

elementary: modify return value of scroller_movement_block_get 

Summary:
A return value of scroller_movement_block_get has been changed by applying the commit(ffa041fe)
The API returned a value which is being exclusively before, but now it returns a composition of states.

This patch modify the api to return "A state" of block mode.

Test Plan:
	1. set movement block mode as ELM_SCROLLER_MOVEMENT_BLOCK_VERTICAL for a scroller
	2. get movement block mode for the scroller
	3. compare the value and ELM_SCROLLER_MOVEMENT_BLOCK_VERTICAL by using == operation, not & operation

Reviewers: jpeg, cedric, woohyun, raster

Subscribers: raster

Differential Revision: https://phab.enlightenment.org/D5793
This commit is contained in:
Wonki Kim 2018-02-14 10:42:17 +09:00 committed by WooHyun Jung
parent 3da806bf3b
commit b84206c4b6
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1198,10 +1198,10 @@ elm_scroller_movement_block_set(Evas_Object *obj,
Efl_Ui_Scroll_Block mode = EFL_UI_SCROLL_BLOCK_NONE;
// legacy -> eo
if (block & ELM_SCROLLER_MOVEMENT_BLOCK_HORIZONTAL)
mode |= EFL_UI_SCROLL_BLOCK_HORIZONTAL;
if (block & ELM_SCROLLER_MOVEMENT_BLOCK_VERTICAL)
mode |= EFL_UI_SCROLL_BLOCK_VERTICAL;
if (block == ELM_SCROLLER_MOVEMENT_BLOCK_HORIZONTAL)
mode = EFL_UI_SCROLL_BLOCK_HORIZONTAL;
else if (block == ELM_SCROLLER_MOVEMENT_BLOCK_VERTICAL)
mode = EFL_UI_SCROLL_BLOCK_VERTICAL;
elm_interface_scrollable_movement_block_set(obj, mode);
}
@ -1209,7 +1209,6 @@ elm_scroller_movement_block_set(Evas_Object *obj,
EAPI Elm_Scroller_Movement_Block
elm_scroller_movement_block_get(const Evas_Object *obj)
{
Elm_Scroller_Movement_Block block = ELM_SCROLLER_MOVEMENT_NO_BLOCK;
Efl_Ui_Scroll_Block mode;
ELM_SCROLLABLE_CHECK(obj, ELM_SCROLLER_MOVEMENT_NO_BLOCK);
@ -1217,12 +1216,12 @@ elm_scroller_movement_block_get(const Evas_Object *obj)
mode = elm_interface_scrollable_movement_block_get(obj);
// eo -> legacy
if (mode & EFL_UI_SCROLL_BLOCK_HORIZONTAL)
block |= ELM_SCROLLER_MOVEMENT_BLOCK_HORIZONTAL;
if (mode & EFL_UI_SCROLL_BLOCK_VERTICAL)
block |= ELM_SCROLLER_MOVEMENT_BLOCK_VERTICAL;
if (mode == EFL_UI_SCROLL_BLOCK_HORIZONTAL)
return ELM_SCROLLER_MOVEMENT_BLOCK_HORIZONTAL;
else if (mode == EFL_UI_SCROLL_BLOCK_VERTICAL)
return ELM_SCROLLER_MOVEMENT_BLOCK_VERTICAL;
return block;
return ELM_SCROLLER_MOVEMENT_NO_BLOCK;
}
EAPI void