diff options
| author | Tom Hacohen <tom@stosb.com> | 2016-06-13 15:56:19 +0100 |
|---|---|---|
| committer | Tom Hacohen <tom@stosb.com> | 2016-06-13 15:56:19 +0100 |
| commit | b307f677e3366185cef24d349b3e47779e7acf1e (patch) | |
| tree | 8dbffe2d0955fad996f74d32997199f522c8adc4 | |
| parent | 98791ccd6d1d14a37b7f7b84e5ab96c4e97f2793 (diff) | |
| download | efl-b307f677e3366185cef24d349b3e47779e7acf1e.tar.gz | |
Ui text interactive: Fix some fixmes.
| -rw-r--r-- | src/lib/elementary/efl_ui_internal_text_interactive.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/lib/elementary/efl_ui_internal_text_interactive.c b/src/lib/elementary/efl_ui_internal_text_interactive.c index c912b6a2fa..196c682f8d 100644 --- a/src/lib/elementary/efl_ui_internal_text_interactive.c +++ b/src/lib/elementary/efl_ui_internal_text_interactive.c @@ -415,16 +415,15 @@ _entry_imf_retrieve_selection_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, #endif static void -_entry_imf_cursor_location_set(Efl_Canvas_Text_Cursor *cur EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en) +_entry_imf_cursor_location_set(Efl_Canvas_Text_Cursor *cur, Efl_Ui_Internal_Text_Interactive_Data *en) { #ifdef HAVE_ECORE_IMF Evas_Coord cx = 0, cy = 0, cw = 0, ch = 0; - Evas_BiDi_Direction dir = 0; if (!en->imf_context) return; - // FIXME _entry_cursor_geometry_get(en->rp, &cx, &cy, &cw, &ch, &dir); + efl_canvas_text_cursor_geometry_get(cur, EFL_CANVAS_TEXT_CURSOR_TYPE_BEFORE, &cx, &cy, &cw, &ch, NULL, NULL, NULL, NULL); ecore_imf_context_cursor_location_set(en->imf_context, cx, cy, cw, ch); - ecore_imf_context_bidi_direction_set(en->imf_context, (Ecore_IMF_BiDi_Direction)dir); + // FIXME: ecore_imf_context_bidi_direction_set(en->imf_context, (Ecore_IMF_BiDi_Direction)dir); #else (void)en; #endif @@ -1347,14 +1346,14 @@ _efl_ui_internal_text_interactive_eo_base_finalize(Eo *obj, Efl_Ui_Internal_Text ecore_imf_context_input_mode_set(en->imf_context, rp->part->entry_mode == EDJE_ENTRY_EDIT_MODE_PASSWORD ? ECORE_IMF_INPUT_MODE_INVISIBLE : ECORE_IMF_INPUT_MODE_FULL); - if (rp->part->multiline) - ecore_imf_context_input_hint_set(en->imf_context, - ecore_imf_context_input_hint_get(en->imf_context) | ECORE_IMF_INPUT_HINT_MULTILINE); if (rp->part->entry_mode == EDJE_ENTRY_EDIT_MODE_PASSWORD) ecore_imf_context_input_panel_language_set(en->imf_context, ECORE_IMF_INPUT_PANEL_LANG_ALPHABET); #endif + if (en->multiline) + ecore_imf_context_input_hint_set(en->imf_context, + ecore_imf_context_input_hint_get(en->imf_context) | ECORE_IMF_INPUT_HINT_MULTILINE); } #endif |