From 0652d0b72aa77aaa88d3c5f424c2a7afae887899 Mon Sep 17 00:00:00 2001 From: SangHyeon Jade Lee Date: Wed, 27 Feb 2019 18:56:25 +0900 Subject: [PATCH] gengrid: fix wrong condition on next item search Change-Id: I81b157092eb028d5bb27a4c01f34d20db3c31dcf Signed-off-by: SangHyeon Jade Lee --- src/lib/elementary/elm_gengrid.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c index 2f2e1b0..280a978 100644 --- a/src/lib/elementary/elm_gengrid.c +++ b/src/lib/elementary/elm_gengrid.c @@ -2920,8 +2920,9 @@ _item_focus_left(Elm_Gengrid_Data *sd) if (!sd->focused_item) { prev = ELM_GEN_ITEM_FROM_INLIST(sd->items->last); - while (((prev) && (prev->generation < sd->generation)) - || elm_object_item_disabled_get(EO_OBJ(prev))) + while ((prev) && + ((prev->generation < sd->generation) + || elm_object_item_disabled_get(EO_OBJ(prev)))) prev = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(prev)->prev); } else @@ -2954,8 +2955,9 @@ _item_focus_right(Elm_Gengrid_Data *sd) if (!sd->focused_item) { next = ELM_GEN_ITEM_FROM_INLIST(sd->items); - while (((next) && (next->generation < sd->generation)) - || elm_object_item_disabled_get(EO_OBJ(next))) + while ((next) && + ((next->generation < sd->generation) + || elm_object_item_disabled_get(EO_OBJ(next)))) next = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(next)->next); } else @@ -3155,8 +3157,9 @@ _item_single_select_left(Elm_Gengrid_Data *sd) if (!sd->selected) { prev = ELM_GEN_ITEM_FROM_INLIST(sd->items->last); - while (((prev) && (prev->generation < sd->generation)) - || elm_object_item_disabled_get(EO_OBJ(prev))) + while ((prev) && + ((prev->generation < sd->generation) + || elm_object_item_disabled_get(EO_OBJ(prev)))) prev = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(prev)->prev); } else @@ -3189,8 +3192,9 @@ _item_single_select_right(Elm_Gengrid_Data *sd) if (!sd->selected) { next = ELM_GEN_ITEM_FROM_INLIST(sd->items); - while (((next) && (next->generation < sd->generation)) - || elm_object_item_disabled_get(EO_OBJ(next))) + while ((next) && + ((next->generation < sd->generation) + || elm_object_item_disabled_get(EO_OBJ(next)))) next = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(next)->next); } else @@ -3914,8 +3918,9 @@ _pick_item(Elm_Gengrid_Data *sd, Elm_Focus_Direction dir) else next = ELM_GEN_ITEM_FROM_INLIST(sd->items->last); - while (((next) && (next->generation < sd->generation)) - || elm_object_item_disabled_get(EO_OBJ(next))) + while ((next) && + ((next->generation < sd->generation) + || elm_object_item_disabled_get(EO_OBJ(next)))) { if (dir == ELM_FOCUS_RIGHT || dir == ELM_FOCUS_DOWN) next = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(next)->next); -- 2.7.4