raster pushed a commit to branch master.

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

commit e147bcd20667a35b9e363bc9cad019acd926e770
Author: Umesh Tanwar <umesh.tan...@samsung.com>
Date:   Fri May 22 14:33:10 2015 +0900

    Genlist: support of ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY mode of genlist 
item for ELM_ITEM_SELECT_ON_FOCUS_DISABLE config variable.
    
    Summary:
    When environment variable ELM_ITEM_SELECT_ON_FOCUS_DISABLE is set
    _item_focused_next() function doesn't support for 
ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY mode.
    
    Signed-off-by: Umesh Tanwar <umesh.tan...@samsung.com>
    
    @fix
    
    Reviewers: raster, Hermet
    
    Subscribers: singh.amitesh, sachin.dev
    
    Differential Revision: https://phab.enlightenment.org/D2464
---
 src/lib/elm_genlist.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index 0c31158..4962347 100644
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -2658,7 +2658,8 @@ _item_focused_next(Evas_Object *obj, Elm_Focus_Direction 
dir)
           return EINA_FALSE;
 
         while ((next) &&
-               (eo_do_ret(EO_OBJ(next), tmp, elm_wdg_item_disabled_get())))
+               ((eo_do_ret(EO_OBJ(next), tmp, elm_wdg_item_disabled_get())) ||
+               (_is_no_select(next))))
           next = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(next)->next);
      }
    else
@@ -2671,7 +2672,9 @@ _item_focused_next(Evas_Object *obj, Elm_Focus_Direction 
dir)
              eo_next = elm_genlist_item_prev_get(sd->focused_item);
              next = eo_data_scope_get(eo_next, ELM_GENLIST_ITEM_CLASS);
 
-             while (eo_do_ret(eo_next, tmp, elm_wdg_item_disabled_get()))
+             while ((next) &&
+                    ((eo_do_ret(eo_next, tmp, elm_wdg_item_disabled_get())) ||
+                    (_is_no_select(next))))
                {
                   eo_next = elm_genlist_item_prev_get(eo_next);
                   next = eo_data_scope_get(eo_next, ELM_GENLIST_ITEM_CLASS);
@@ -2684,7 +2687,9 @@ _item_focused_next(Evas_Object *obj, Elm_Focus_Direction 
dir)
              eo_next = elm_genlist_item_next_get(sd->focused_item);
              next = eo_data_scope_get(eo_next, ELM_GENLIST_ITEM_CLASS);
 
-             while (eo_do_ret(eo_next, tmp, elm_wdg_item_disabled_get()))
+             while ((next) &&
+                    ((eo_do_ret(eo_next, tmp, elm_wdg_item_disabled_get())) ||
+                    (_is_no_select(next))))
                {
                   eo_next = elm_genlist_item_next_get(eo_next);
                   next = eo_data_scope_get(eo_next, ELM_GENLIST_ITEM_CLASS);

-- 


Reply via email to