bu5hm4n pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=149d03d8f4832628b71d4460f7dd8abec4ee46dd
commit 149d03d8f4832628b71d4460f7dd8abec4ee46dd Author: Marcel Hollerbach <[email protected]> Date: Mon Nov 20 22:38:08 2017 +0100 efl_ui_text: remove the event emits here with the previous commit we emit the legacy events for each interface event, and thus this event is not needed. However, in elm_entry this means that changing editable will _not_ reemit the focus event (where i am not that sure if that is correct or not). --- src/lib/elementary/efl_ui_text.c | 2 -- src/lib/elementary/elm_entry.c | 8 ++++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c index c1b9bd7287..05619dccc9 100644 --- a/src/lib/elementary/efl_ui_text.c +++ b/src/lib/elementary/efl_ui_text.c @@ -1211,7 +1211,6 @@ _efl_ui_text_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Text_Data *sd, Elm_Objec if (top && top_is_win && sd->input_panel_enable && !sd->input_panel_show_on_demand) elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_ON); - efl_event_callback_legacy_call(obj, EFL_UI_WIDGET_EVENT_FOCUSED, NULL); if (_elm_config->atspi_mode) efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_FOCUSED, EINA_TRUE); _return_key_enabled_check(obj); @@ -1228,7 +1227,6 @@ _efl_ui_text_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Text_Data *sd, Elm_Objec if (top && top_is_win && sd->input_panel_enable) elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_OFF); - efl_event_callback_legacy_call(obj, EFL_UI_WIDGET_EVENT_UNFOCUSED, NULL); if (_elm_config->atspi_mode) efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_FOCUSED, EINA_FALSE); diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c index 948fa053cf..6adff14742 100644 --- a/src/lib/elementary/elm_entry.c +++ b/src/lib/elementary/elm_entry.c @@ -1266,7 +1266,6 @@ _elm_entry_focus_update(Eo *obj, Elm_Entry_Data *sd) if (top && top_is_win && sd->input_panel_enable && !sd->input_panel_show_on_demand && !edje_object_part_text_imf_context_get(sd->entry_edje, "elm.text")) elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_ON); - efl_event_callback_legacy_call(obj, EFL_UI_WIDGET_EVENT_FOCUSED, NULL); if (_elm_config->atspi_mode) efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_FOCUSED, EINA_TRUE); _return_key_enabled_check(obj); @@ -1281,7 +1280,6 @@ _elm_entry_focus_update(Eo *obj, Elm_Entry_Data *sd) if (top && top_is_win && sd->input_panel_enable && !edje_object_part_text_imf_context_get(sd->entry_edje, "elm.text")) elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_OFF); - efl_event_callback_legacy_call(obj, EFL_UI_WIDGET_EVENT_UNFOCUSED, NULL); if (_elm_config->atspi_mode) efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_FOCUSED, EINA_FALSE); @@ -4255,6 +4253,12 @@ _elm_entry_editable_set(Eo *obj, Elm_Entry_Data *sd, Eina_Bool editable) efl_ui_widget_theme_apply(obj); _elm_entry_focus_update(obj, sd); + //legacy focus event emission + if (efl_ui_focus_object_focus_get(obj)) + evas_object_smart_callback_call(obj, "focused", NULL); + else + evas_object_smart_callback_call(obj, "unfocused", NULL); + elm_drop_target_del(obj, sd->drop_format, _dnd_enter_cb, NULL, _dnd_leave_cb, NULL, --
