summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUmesh Tanwar <umesh.tanwar@samsung.com>2015-05-22 14:33:10 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2015-05-22 14:33:11 +0900
commite147bcd20667a35b9e363bc9cad019acd926e770 (patch)
tree310a3aa9fba147681c8a83768a51dd0e8a23b9ac
parent86d650c3ab5f079ed4028ff55901c042960e35d4 (diff)
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.tanwar@samsung.com> @fix Reviewers: raster, Hermet Subscribers: singh.amitesh, sachin.dev Differential Revision: https://phab.enlightenment.org/D2464
-rw-r--r--src/lib/elm_genlist.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index 0c31158a5..49623470e 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)
2658 return EINA_FALSE; 2658 return EINA_FALSE;
2659 2659
2660 while ((next) && 2660 while ((next) &&
2661 (eo_do_ret(EO_OBJ(next), tmp, elm_wdg_item_disabled_get()))) 2661 ((eo_do_ret(EO_OBJ(next), tmp, elm_wdg_item_disabled_get())) ||
2662 (_is_no_select(next))))
2662 next = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(next)->next); 2663 next = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(next)->next);
2663 } 2664 }
2664 else 2665 else
@@ -2671,7 +2672,9 @@ _item_focused_next(Evas_Object *obj, Elm_Focus_Direction dir)
2671 eo_next = elm_genlist_item_prev_get(sd->focused_item); 2672 eo_next = elm_genlist_item_prev_get(sd->focused_item);
2672 next = eo_data_scope_get(eo_next, ELM_GENLIST_ITEM_CLASS); 2673 next = eo_data_scope_get(eo_next, ELM_GENLIST_ITEM_CLASS);
2673 2674
2674 while (eo_do_ret(eo_next, tmp, elm_wdg_item_disabled_get())) 2675 while ((next) &&
2676 ((eo_do_ret(eo_next, tmp, elm_wdg_item_disabled_get())) ||
2677 (_is_no_select(next))))
2675 { 2678 {
2676 eo_next = elm_genlist_item_prev_get(eo_next); 2679 eo_next = elm_genlist_item_prev_get(eo_next);
2677 next = eo_data_scope_get(eo_next, ELM_GENLIST_ITEM_CLASS); 2680 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)
2684 eo_next = elm_genlist_item_next_get(sd->focused_item); 2687 eo_next = elm_genlist_item_next_get(sd->focused_item);
2685 next = eo_data_scope_get(eo_next, ELM_GENLIST_ITEM_CLASS); 2688 next = eo_data_scope_get(eo_next, ELM_GENLIST_ITEM_CLASS);
2686 2689
2687 while (eo_do_ret(eo_next, tmp, elm_wdg_item_disabled_get())) 2690 while ((next) &&
2691 ((eo_do_ret(eo_next, tmp, elm_wdg_item_disabled_get())) ||
2692 (_is_no_select(next))))
2688 { 2693 {
2689 eo_next = elm_genlist_item_next_get(eo_next); 2694 eo_next = elm_genlist_item_next_get(eo_next);
2690 next = eo_data_scope_get(eo_next, ELM_GENLIST_ITEM_CLASS); 2695 next = eo_data_scope_get(eo_next, ELM_GENLIST_ITEM_CLASS);