summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHosang Kim <hosang12.kim@samsung.com>2015-08-28 18:08:14 +0900
committerChunEon Park <hermet@hermet.pe.kr>2015-08-28 18:11:32 +0900
commitf42fe2dcf8301c5beba61f99358157845a17474b (patch)
tree5d5737886be9048551d85317b3f1ea1643cc910a
parent77afec04f984b24e5016b1c93952861060bc2e66 (diff)
Revert "Elm_Interface_Scrollable: Improvement in looping behavior"
Summary: This reverts commit bba4c217f2ce4f032fca6298cc8b2fc6ff3d7c19. "x and y position variable assumes values ranging from min to max " is right. but in looping behavior, x and y are able to have value bigger than max or smaller than min. @fix Test Plan: 1. elementary_test -> scroller 2. on Loop in X axis 3. scrolling page to left. 4. page is moved last page directly. Reviewers: SanghyeonLee, tanwar.umesh07, raster, cedric, jaehwan, Hermet Reviewed By: Hermet Differential Revision: https://phab.enlightenment.org/D2977
-rw-r--r--src/lib/elm_interface_scrollable.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/elm_interface_scrollable.c b/src/lib/elm_interface_scrollable.c
index 5bc5509e1..27a46c164 100644
--- a/src/lib/elm_interface_scrollable.c
+++ b/src/lib/elm_interface_scrollable.c
@@ -1515,13 +1515,13 @@ _elm_interface_scrollable_content_pos_set(Eo *obj, Elm_Scrollable_Smart_Interfac
1515 1515
1516 if (sid->loop_h && cw > 0) 1516 if (sid->loop_h && cw > 0)
1517 { 1517 {
1518 if (x < minx) x = mx + (x % mx); 1518 if (x < 0) x = cw + (x % cw);
1519 else if (x > mx) x = (x % mx); 1519 else if (x >= cw) x = (x % cw);
1520 } 1520 }
1521 if (sid->loop_v && ch > 0) 1521 if (sid->loop_v && ch > 0)
1522 { 1522 {
1523 if (y < miny) y = my + (y % my); 1523 if (y < 0) y = ch + (y % ch);
1524 else if (y > my) y = (y % my); 1524 else if (y >= ch) y = (y % ch);
1525 } 1525 }
1526 1526
1527 if (!_elm_config->thumbscroll_bounce_enable) 1527 if (!_elm_config->thumbscroll_bounce_enable)