hermet pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=ba72d7462e2c2a6dabbcb5c2427bbaa15b10cf2a
commit ba72d7462e2c2a6dabbcb5c2427bbaa15b10cf2a Author: ChunEon Park <[email protected]> Date: Wed Oct 9 23:29:35 2013 +0900 elementary/scroller - --duplicated compare. --- src/lib/elm_interface_scrollable.c | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/src/lib/elm_interface_scrollable.c b/src/lib/elm_interface_scrollable.c index 2cbb0c9..aecb77f 100644 --- a/src/lib/elm_interface_scrollable.c +++ b/src/lib/elm_interface_scrollable.c @@ -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) - { - //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) + if (_paging_is_enabled(sid)) { - //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) --
