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

elementary/scroller - --duplicated compare.

This commit is contained in:
ChunEon Park 2013-10-09 23:29:35 +09:00
parent cd3f781309
commit 77d336b3fb
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
legacy/elementary/src/lib/elm_interface_scrollable.c
View File

@ -1529,23 +1529,26 @@ _elm_scroll_content_pos_set(Eo *obj, void *_pd, va_list *list)
eo_do(sid->pan_obj, elm_obj_pan_pos_min_get(&minx, &miny));
eo_do(sid->pan_obj, elm_obj_pan_pos_get(&px, &py));
if (_paging_is_enabled(sid) && sid->page_snap_horiz)
if (_paging_is_enabled(sid))
{
//we passed one page to the right
if (x > sid->current_page.x + sid->pagesize_h)
x = sid->current_page.x + sid->pagesize_h;
//we passed one page to the left
if (x < sid->current_page.x - sid->pagesize_h)
x = sid->current_page.x - sid->pagesize_h;
}
if (_paging_is_enabled(sid) && sid->page_snap_vert)
{
//we passed one page to the bottom
if (y > sid->current_page.y + sid->pagesize_v)
y = sid->current_page.y + sid->pagesize_v;
//we passed one page to the top
if (y < sid->current_page.y - sid->pagesize_v)
y = sid->current_page.y - sid->pagesize_v;
if (sid->page_snap_horiz)
{
//we passed one page to the right
if (x > sid->current_page.x + sid->pagesize_h)
x = sid->current_page.x + sid->pagesize_h;
//we passed one page to the left
if (x < sid->current_page.x - sid->pagesize_h)
x = sid->current_page.x - sid->pagesize_h;
}
if (sid->page_snap_vert)
{
//we passed one page to the bottom
if (y > sid->current_page.y + sid->pagesize_v)
y = sid->current_page.y + sid->pagesize_v;
//we passed one page to the top
if (y < sid->current_page.y - sid->pagesize_v)
y = sid->current_page.y - sid->pagesize_v;
}
}
if (!_elm_config->thumbscroll_bounce_enable)