From 1e25fe887d86f34f2f4673c0f75e777fe8327f6b Mon Sep 17 00:00:00 2001 From: Yeongjong Lee Date: Wed, 5 Dec 2018 18:39:08 +0900 Subject: [PATCH] elm_widget: disable focus manager stuff @tizen_fix Change-Id: Icc4c6d6a4f35d1a909e08bac4e6a3c830d0cb9ec --- src/lib/elementary/elm_focus_legacy.c | 3 ++- src/lib/elementary/elm_gengrid.c | 28 ++++++++++++++++++++++++++-- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/src/lib/elementary/elm_focus_legacy.c b/src/lib/elementary/elm_focus_legacy.c index f5675e7..3490fc7 100644 --- a/src/lib/elementary/elm_focus_legacy.c +++ b/src/lib/elementary/elm_focus_legacy.c @@ -316,7 +316,8 @@ elm_object_focused_object_get(const Evas_Object *obj) EAPI Eina_Bool elm_object_focus_get(const Evas_Object *obj) { - API_ENTRY_VAL(EINA_FALSE) + //TIZEN_ONLY(20181205): disable focus manager stuff + //API_ENTRY_VAL(EINA_FALSE) if (!elm_widget_is(obj)) return evas_object_focus_get(obj); diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c index e9860df..197d132 100644 --- a/src/lib/elementary/elm_gengrid.c +++ b/src/lib/elementary/elm_gengrid.c @@ -2051,7 +2051,10 @@ _item_place(Elm_Gen_Item *it, _elm_gengrid_item_index_update(it); efl_event_callback_legacy_call (WIDGET(it), ELM_GENGRID_EVENT_REALIZED, EO_OBJ(it)); - _flush_focus_on_realization(WIDGET(it), it); + //TIZEN_ONLY(20181205): disable focus manager stuff + //_flush_focus_on_realization(WIDGET(it), it); + if (!elm_widget_is_legacy(WIDGET(it))) + _flush_focus_on_realization(WIDGET(it), it); } if (it->parent) { @@ -2270,7 +2273,10 @@ _group_item_place(Elm_Gengrid_Pan_Data *psd) _elm_gengrid_item_index_update(it); efl_event_callback_legacy_call (WIDGET(it), ELM_GENGRID_EVENT_REALIZED, EO_OBJ(it)); - _flush_focus_on_realization(WIDGET(it), it); + //TIZEN_ONLY(20181205): disable focus manager stuff + //_flush_focus_on_realization(WIDGET(it), it); + if (!elm_widget_is_legacy(WIDGET(it))) + _flush_focus_on_realization(WIDGET(it), it); } //TIZEN_ONLY(20170131): Group on Top Feature is not tizen UI. /* @@ -4821,6 +4827,8 @@ _elm_gengrid_item_elm_widget_item_item_focus_set(Eo *eo_it, Elm_Gen_Item *it, Ei { if (sd->focused_item) _elm_gengrid_item_unfocused(sd->focused_item); + //TIZEN_ONLY(20181205): disable focus manager stuff + /* if (it->realized) { _elm_gengrid_item_focused(eo_it); @@ -4831,6 +4839,22 @@ _elm_gengrid_item_elm_widget_item_item_focus_set(Eo *eo_it, Elm_Gen_Item *it, Ei { sd->focus_on_realization = it; } + */ + if (elm_widget_is_legacy(obj)) + _elm_gengrid_item_focused(eo_it); + else + { + if (it->realized) + { + _elm_gengrid_item_focused(eo_it); + sd->focus_on_realization = NULL; + efl_ui_focus_manager_focus_set(obj, eo_it); + } + else + { + sd->focus_on_realization = it; + } + } } } else -- 2.7.4