raster pushed a commit to branch master.

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

commit 266bdc2f40acb4b772b75759e014f85710525ea8
Author: VBS <[email protected]>
Date:   Mon Jan 12 11:51:41 2015 +0900

    Scroller : Fix elm_scroller_last_page_get API wrong return value
    
    Summary:
    When first page is last page, elm_scroller_last_page_get need to return 0.
             But if pagesize is bigger then current content height or width, 
value will be returned -1.
             So fix this cases to return 0.
    
    Test Plan: If set elm_scroller_page_set bigger then current content size, 
then issue is occurred.
    
    Reviewers: seoz, jaehwan, raster
    
    Reviewed By: raster
    
    Subscribers: eagleeye
    
    Differential Revision: https://phab.enlightenment.org/D1860
---
 src/lib/elm_interface_scrollable.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/elm_interface_scrollable.c 
b/src/lib/elm_interface_scrollable.c
index 3c8db92..d1b818a 100644
--- a/src/lib/elm_interface_scrollable.c
+++ b/src/lib/elm_interface_scrollable.c
@@ -4180,14 +4180,14 @@ _elm_interface_scrollable_last_page_get(Eo *obj 
EINA_UNUSED, Elm_Scrollable_Smar
    eo_do(sid->pan_obj, elm_obj_pan_content_size_get(&cw, &ch));
    if (pagenumber_h)
      {
-        if (sid->pagesize_h > 0)
+        if ((sid->pagesize_h > 0) && (cw > sid->pagesize_h))
           *pagenumber_h = cw / sid->pagesize_h - 1;
         else
           *pagenumber_h = 0;
      }
    if (pagenumber_v)
      {
-        if (sid->pagesize_v > 0)
+        if ((sid->pagesize_v > 0) && (ch > sid->pagesize_v))
           *pagenumber_v = ch / sid->pagesize_v - 1;
         else
           *pagenumber_v = 0;

-- 


Reply via email to