raster pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=aa93b1071b40d0f2215f2f5703c083a960b7bbc1

commit aa93b1071b40d0f2215f2f5703c083a960b7bbc1
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Apr 22 11:41:41 2015 +0900

    interface scroll: handle wanted x coordinates in case of mirroring.
    
    Summary:
    In case of mirror enabled, wanted x should come from 
_elm_scroll_x_mirrored_get().
    This defect is visible in case of some fancy effects on scroller (map).
    
    @Fix
    
    Reviewers: raster, Hermet
    
    Subscribers: herdsman, sachin.dev, kimcinoo, eagleeye, seoz
    
    Differential Revision: https://phab.enlightenment.org/D2363
---
 src/lib/elm_interface_scrollable.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lib/elm_interface_scrollable.c 
b/src/lib/elm_interface_scrollable.c
index 4a4a988..e52d78e 100644
--- a/src/lib/elm_interface_scrollable.c
+++ b/src/lib/elm_interface_scrollable.c
@@ -1209,15 +1209,15 @@ 
_elm_scroll_wanted_coordinates_update(Elm_Scrollable_Smart_Interface_Data *sid,
    eo_do(sid->obj, elm_interface_scrollable_content_viewport_geometry_get
          (NULL, NULL, &sid->ww, &sid->wh));
 
-   if (x < minx)
+   if (x < minx && !sid->is_mirrored)
      {
         if (!sid->loop_h) sid->wx = minx;
         else sid->wx = mx;
      }
-   else if (!sid->loop_h && (x > mx)) sid->wx = mx;
-   else if (sid->loop_h && x >= (sid->ww + mx)) sid->wx = 0;
    else if (sid->is_mirrored)
      sid->wx = _elm_scroll_x_mirrored_get(sid->obj, x);
+   else if (!sid->loop_h && (x > mx)) sid->wx = mx;
+   else if (sid->loop_h && x >= (sid->ww + mx)) sid->wx = 0;
    else sid->wx = x;
 
    if (y < miny)

-- 


Reply via email to