From 59ac085b9a81b8fe254259625fc189402ec978b2 Mon Sep 17 00:00:00 2001 From: Shinwoo Kim Date: Wed, 11 May 2022 16:40:27 +0900 Subject: [PATCH] genlist: unset FOCUSABLE, HIGHLIGHTABLE for DISPLAY_ONLY item Application uses the DISPLAY_ONLY item as a seperator. This item does not have to get focus or highlight. Change-Id: Ic49a81ea96f194cf8de44a231cd5c7df683c1249 --- src/lib/elementary/elm_genlist.c | 11 +++++++++++ src/lib/elementary_tizen/elm_genlist.c | 12 ++++++++++++ 2 files changed, 23 insertions(+) diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c index e67f653..b3b5c90 100644 --- a/src/lib/elementary/elm_genlist.c +++ b/src/lib/elementary/elm_genlist.c @@ -9082,6 +9082,17 @@ _elm_genlist_item_efl_access_object_state_set_get(const Eo *eo_it, Elm_Gen_Item STATE_TYPE_SET(ret, EFL_ACCESS_STATE_TYPE_COLLAPSED); } // + //TIZEN_ONLY(20220511): Unset focusable,highlightable state for dispaly only item + Elm_Genlist_Data *sd = GL_IT(it)->wsd; + if ((sd->select_mode == ELM_OBJECT_SELECT_MODE_NONE) || + (sd->select_mode == ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY ) || + (it->select_mode == ELM_OBJECT_SELECT_MODE_NONE) || + (it->select_mode == ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY )) + { + STATE_TYPE_UNSET(ret, ELM_ATSPI_STATE_HIGHLIGHTABLE); + STATE_TYPE_UNSET(ret, ELM_ATSPI_STATE_FOCUSABLE); + } + // return ret; } diff --git a/src/lib/elementary_tizen/elm_genlist.c b/src/lib/elementary_tizen/elm_genlist.c index 73184dd..6090947 100644 --- a/src/lib/elementary_tizen/elm_genlist.c +++ b/src/lib/elementary_tizen/elm_genlist.c @@ -10631,6 +10631,18 @@ _elm_genlist_item_efl_access_object_state_set_get(const Eo *eo_it, Elm_Gen_Item if (it && it->itc && it->itc->item_style && strstr(it->itc->item_style, "title")) STATE_TYPE_SET(ret, ELM_ATSPI_STATE_READ_ONLY); // + //TIZEN_ONLY(20220511): Unset focusable,highlightable state for dispaly only item + Elm_Genlist_Data *sd = GL_IT(it)->wsd; + if ((sd->select_mode == ELM_OBJECT_SELECT_MODE_NONE) || + (sd->select_mode == ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY ) || + (it->select_mode == ELM_OBJECT_SELECT_MODE_NONE) || + (it->select_mode == ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY )) + { + STATE_TYPE_UNSET(ret, ELM_ATSPI_STATE_HIGHLIGHTABLE); + STATE_TYPE_UNSET(ret, ELM_ATSPI_STATE_FOCUSABLE); + } + // + return ret; } -- 2.7.4