summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <marcel@osg.samsung.com>2017-10-20 11:45:07 +0200
committerMarcel Hollerbach <marcel@osg.samsung.com>2017-10-20 11:54:08 +0200
commit0b81f9c8082b5f6597efb47d9676558f8eeeab48 (patch)
tree3834d85dee2982a963fd07a9f6d217770c1344d1
parent7f12ca0f84620443f59bbc6d57cd265ea05c7f62 (diff)
elm_entry: correctly emit unfocus signals to the edje object
-rw-r--r--src/lib/elementary/elm_entry.c2
-rw-r--r--src/lib/elementary/elm_widget.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index a9b1d5397b..9414202239 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -1255,7 +1255,7 @@ _elm_entry_focus_update(Eo *obj, Elm_Entry_Data *sd)
1255 if (top && efl_isa(top, EFL_UI_WIN_CLASS)) 1255 if (top && efl_isa(top, EFL_UI_WIN_CLASS))
1256 top_is_win = EINA_TRUE; 1256 top_is_win = EINA_TRUE;
1257 1257
1258 if (elm_widget_focus_get(obj) && sd->editable) 1258 if (efl_ui_focus_object_focus_get(obj) && sd->editable)
1259 { 1259 {
1260 evas_object_focus_set(sd->entry_edje, EINA_TRUE); 1260 evas_object_focus_set(sd->entry_edje, EINA_TRUE);
1261 edje_object_signal_emit(sd->entry_edje, "elm,action,focus", "elm"); 1261 edje_object_signal_emit(sd->entry_edje, "elm,action,focus", "elm");
diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c
index cc872e0c16..13b073b45e 100644
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -5434,9 +5434,10 @@ EOLIAN static void
5434_elm_widget_efl_ui_focus_object_focus_set(Eo *obj, Elm_Widget_Smart_Data *pd, Eina_Bool focus) 5434_elm_widget_efl_ui_focus_object_focus_set(Eo *obj, Elm_Widget_Smart_Data *pd, Eina_Bool focus)
5435{ 5435{
5436 pd->focused = focus; 5436 pd->focused = focus;
5437 elm_obj_widget_on_focus_update(obj, NULL);
5438 5437
5439 efl_ui_focus_object_focus_set(efl_super(obj, MY_CLASS), focus); 5438 efl_ui_focus_object_focus_set(efl_super(obj, MY_CLASS), focus);
5439
5440 elm_obj_widget_on_focus_update(obj, NULL);
5440} 5441}
5441 5442
5442EOLIAN static Efl_Ui_Focus_Manager* 5443EOLIAN static Efl_Ui_Focus_Manager*