summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChunEon Park <hermet@hermet.pe.kr>2013-10-10 19:58:01 +0900
committerChunEon Park <hermet@hermet.pe.kr>2013-10-10 19:58:42 +0900
commitc8b4d4c4ee3977a56eb9c6ac3021c458776b47ba (patch)
tree88202bd5e5a9f34b34377b1644e6f5876f8b2aab
parenta6cbfa8b2ffe1ec7aab52f627be27f11a05e936d (diff)
elementary/scroller - fix the scroller to locate the current page correctly in case that the scroller is suddenly resized and then the drag couldn't capture the page location.
-rw-r--r--ChangeLog6
-rw-r--r--NEWS1
-rw-r--r--src/lib/elm_interface_scrollable.c7
3 files changed, 14 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 7891a1bd9..3e9e5b350 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1683,3 +1683,9 @@
16832013-10-08 Daesung Kim (ad960009) 16832013-10-08 Daesung Kim (ad960009)
1684 1684
1685 * ctxpopup : fix elm_object_content_unset didn't unpack content from box 1685 * ctxpopup : fix elm_object_content_unset didn't unpack content from box
1686
16872013-10-10 ChunEon Park (Hermet)
1688
1689 * scroller : fix the scroller to locate the current page correctly
1690 in case that the scroller is suddenly resized and then the drag
1691 couldn't capture the page location.
diff --git a/NEWS b/NEWS
index bff325a7c..199215041 100644
--- a/NEWS
+++ b/NEWS
@@ -297,6 +297,7 @@ Fixes:
297 * elm_player breaks theme due to poor namespacing 297 * elm_player breaks theme due to poor namespacing
298 * elm_popup breaks theme due to poor namespacing 298 * elm_popup breaks theme due to poor namespacing
299 * ctxpopup: fix elm_object_content_unset didn't unpack content from box 299 * ctxpopup: fix elm_object_content_unset didn't unpack content from box
300 * scroller : fix the scroller to locate the current page correctly in case that the scroller is suddenly resized and then the drag couldn't capture the page location.
300 301
301Removals: 302Removals:
302 303
diff --git a/src/lib/elm_interface_scrollable.c b/src/lib/elm_interface_scrollable.c
index aecb77ff7..981ff0095 100644
--- a/src/lib/elm_interface_scrollable.c
+++ b/src/lib/elm_interface_scrollable.c
@@ -948,6 +948,13 @@ _elm_scroll_scroll_bar_read_and_update(
948 x = _round(vx * (double)mx + minx, 1); 948 x = _round(vx * (double)mx + minx, 1);
949 y = _round(vy * (double)my + miny, 1); 949 y = _round(vy * (double)my + miny, 1);
950 eo_do(sid->pan_obj, elm_obj_pan_pos_get(&px, &py)); 950 eo_do(sid->pan_obj, elm_obj_pan_pos_get(&px, &py));
951
952 if (!sid->freeze && _paging_is_enabled(sid))
953 {
954 x = _elm_scroll_page_x_get(sid, x - px, EINA_FALSE);
955 y = _elm_scroll_page_y_get(sid, y - py, EINA_FALSE);
956 }
957
951 eo_do(sid->pan_obj, elm_obj_pan_pos_set(x, y)); 958 eo_do(sid->pan_obj, elm_obj_pan_pos_set(x, y));
952 if ((px != x) || (py != y)) 959 if ((px != x) || (py != y))
953 { 960 {