From 295e05ab217a5bf37cd059855f45d1ea279fe7f2 Mon Sep 17 00:00:00 2001 From: Tae-Hwan Kim Date: Fri, 7 Jun 2013 22:06:30 +0900 Subject: [PATCH] [Genlist/Gengrid] Fix focus Only genlist/gengrid is focused, focus state is enabled. Change-Id: I15c5db47c29227564d4cb6c97e14c9251e70e41c --- src/lib/elm_gengrid.c | 8 +++++--- src/lib/elm_genlist.c | 7 +++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c index 504399e..1c3f40e 100644 --- a/src/lib/elm_gengrid.c +++ b/src/lib/elm_gengrid.c @@ -920,9 +920,11 @@ _item_realize(Elm_Gen_Item *it) if (it->selected) edje_object_signal_emit(VIEW(it), "elm,state,selected", "elm"); - if (GG_IT(it)->wsd->focused) - edje_object_signal_emit (VIEW(GG_IT(it)->wsd->focused), "elm,state,focused", "elm"); - + if (elm_widget_focus_get(ELM_WIDGET_DATA(GG_IT(it)->wsd)->obj)) + { + if (GG_IT(it)->wsd->focused) + edje_object_signal_emit (VIEW(GG_IT(it)->wsd->focused), "elm,state,focused", "elm"); + } if (elm_widget_item_disabled_get(it)) edje_object_signal_emit(VIEW(it), "elm,state,disabled", "elm"); } diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c index 02c71d8..727ada1 100644 --- a/src/lib/elm_genlist.c +++ b/src/lib/elm_genlist.c @@ -1884,8 +1884,11 @@ _item_realize(Elm_Gen_Item *it, edje_object_message_signal_process(it->item->deco_it_view); } } - if (GL_IT(it)->wsd->focused) - edje_object_signal_emit (VIEW(GL_IT(it)->wsd->focused), "elm,state,focused", "elm"); + if (elm_widget_focus_get(ELM_WIDGET_DATA(GL_IT(it)->wsd)->obj)) + { + if (GL_IT(it)->wsd->focused) + edje_object_signal_emit (VIEW(GL_IT(it)->wsd->focused), "elm,state,focused", "elm"); + } edje_object_message_signal_process(VIEW(it)); } -- 2.7.4