summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/lib/elementary/efl_ui_textbox.c22
1 files changed, 7 insertions, 15 deletions
diff --git a/src/lib/elementary/efl_ui_textbox.c b/src/lib/elementary/efl_ui_textbox.c
index b72521b..5aac159 100644
--- a/src/lib/elementary/efl_ui_textbox.c
+++ b/src/lib/elementary/efl_ui_textbox.c
@@ -821,8 +821,7 @@ _efl_ui_textbox_efl_canvas_group_group_calculate(Eo *obj, Efl_Ui_Textbox_Data *s
821EOLIAN static Eina_Bool 821EOLIAN static Eina_Bool
822_efl_ui_textbox_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Textbox_Data *sd) 822_efl_ui_textbox_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Textbox_Data *sd)
823{ 823{
824 Evas_Object *top; 824 Efl_Object *top;
825 Eina_Bool top_is_win = EINA_FALSE;
826 825
827 if (!efl_text_interactive_editable_get(obj)) return EINA_FALSE; 826 if (!efl_text_interactive_editable_get(obj)) return EINA_FALSE;
828 827
@@ -834,7 +833,7 @@ _efl_ui_textbox_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Textbox_Data
834 833
835 _edje_signal_emit(sd, "efl,action,focus", "efl"); 834 _edje_signal_emit(sd, "efl,action,focus", "efl");
836 835
837 if (top && efl_input_text_input_panel_autoshow_get(obj) && !efl_input_text_input_panel_show_on_demand_get(obj)) 836 if (efl_input_text_input_panel_autoshow_get(obj) && !efl_input_text_input_panel_show_on_demand_get(obj))
838 elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_ON); 837 elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_ON);
839 if (_elm_config->atspi_mode) 838 if (_elm_config->atspi_mode)
840 efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_TYPE_FOCUSED, EINA_TRUE); 839 efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_TYPE_FOCUSED, EINA_TRUE);
@@ -846,7 +845,7 @@ _efl_ui_textbox_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Textbox_Data
846 _edje_signal_emit(sd, "efl,action,unfocus", "efl"); 845 _edje_signal_emit(sd, "efl,action,unfocus", "efl");
847 efl_canvas_object_key_focus_set(sw, EINA_FALSE); 846 efl_canvas_object_key_focus_set(sw, EINA_FALSE);
848 847
849 if (top && top_is_win && efl_input_text_input_panel_autoshow_get(obj)) 848 if (efl_input_text_input_panel_autoshow_get(obj))
850 elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_OFF); 849 elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_OFF);
851 if (_elm_config->atspi_mode) 850 if (_elm_config->atspi_mode)
852 efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_TYPE_FOCUSED, EINA_FALSE); 851 efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_TYPE_FOCUSED, EINA_FALSE);
@@ -1270,8 +1269,7 @@ _mouse_up_cb(void *data,
1270 void *event_info) 1269 void *event_info)
1271{ 1270{
1272 Evas_Event_Mouse_Up *ev = event_info; 1271 Evas_Event_Mouse_Up *ev = event_info;
1273 Eina_Bool top_is_win = EINA_FALSE; 1272 Efl_Object *top;
1274 Evas_Object *top;
1275 1273
1276 EFL_UI_TEXT_DATA_GET(data, sd); 1274 EFL_UI_TEXT_DATA_GET(data, sd);
1277 1275
@@ -1292,15 +1290,9 @@ _mouse_up_cb(void *data,
1292 } 1290 }
1293 else 1291 else
1294 { 1292 {
1295 top = elm_widget_top_get(data); 1293 top = efl_provider_find(data, EFL_UI_WIN_CLASS);
1296 if (top) 1294 if (efl_input_text_input_panel_autoshow_get(data) && efl_input_text_input_panel_show_on_demand_get(data))
1297 { 1295 elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_ON);
1298 if (efl_isa(top, EFL_UI_WIN_CLASS))
1299 top_is_win = EINA_TRUE;
1300
1301 if (top_is_win && efl_input_text_input_panel_autoshow_get(data) && efl_input_text_input_panel_show_on_demand_get(data))
1302 elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_ON);
1303 }
1304 } 1296 }
1305 } 1297 }
1306 /* Since context menu disabled flag was checked at mouse right key down, 1298 /* Since context menu disabled flag was checked at mouse right key down,