herdsman pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=43949062eba1e4390d66d0aa2a5c7625f86e421d
commit 43949062eba1e4390d66d0aa2a5c7625f86e421d
Author: Daniel Hirt <daniel.h...@samsung.com>
Date: Mon Dec 12 11:21:01 2016 +0200
Ui text: remove unimplemented imf api
---
src/lib/elementary/efl_ui_text.c | 23 +++--------------------
src/lib/elementary/efl_ui_text.eo | 19 -------------------
2 files changed, 3 insertions(+), 39 deletions(-)
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index 4470df6..5a27de9 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -1181,8 +1181,7 @@ _efl_ui_text_elm_widget_on_focus(Eo *obj,
Efl_Ui_Text_Data *sd, Elm_Object_Item
if (sd->scroll)
edje_object_signal_emit(sd->scr_edje, "elm,action,focus", "elm");
- 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"))
+ 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, ELM_WIDGET_EVENT_FOCUSED, NULL);
if (_elm_config->atspi_mode)
@@ -1199,8 +1198,7 @@ _efl_ui_text_elm_widget_on_focus(Eo *obj,
Efl_Ui_Text_Data *sd, Elm_Object_Item
edje_object_signal_emit(sd->scr_edje, "elm,action,unfocus", "elm");
evas_object_focus_set(sw, EINA_FALSE);
- if (top && top_is_win && sd->input_panel_enable &&
- !edje_object_part_text_imf_context_get(sd->entry_edje, "elm.text"))
+ 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, ELM_WIDGET_EVENT_UNFOCUSED, NULL);
if (_elm_config->atspi_mode)
@@ -2002,8 +2000,7 @@ _mouse_up_cb(void *data,
if (efl_isa(top, EFL_UI_WIN_CLASS))
top_is_win = EINA_TRUE;
- if (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"))
+ if (top_is_win && sd->input_panel_enable &&
sd->input_panel_show_on_demand)
elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_ON);
}
}
@@ -4142,12 +4139,6 @@ _efl_ui_text_input_hint_get(Eo *obj EINA_UNUSED,
Efl_Ui_Text_Data *sd)
}
EOLIAN static void
-_efl_ui_text_imf_context_reset(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd)
-{
- edje_object_part_text_imf_context_reset(sd->entry_edje, "elm.text");
-}
-
-EOLIAN static void
_efl_ui_text_input_panel_enabled_set(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data
*sd, Eina_Bool enabled)
{
sd->input_panel_enable = enabled;
@@ -4261,14 +4252,6 @@ _efl_ui_text_input_panel_show_on_demand_get(Eo *obj
EINA_UNUSED, Efl_Ui_Text_Dat
return sd->input_panel_show_on_demand;
}
-EOLIAN static void*
-_efl_ui_text_imf_context_get(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd)
-{
- if (!sd) return NULL;
-
- return edje_object_part_text_imf_context_get(sd->entry_edje, "elm.text");
-}
-
/* START - ANCHOR HOVER */
static void
_anchor_parent_del_cb(void *data,
diff --git a/src/lib/elementary/efl_ui_text.eo
b/src/lib/elementary/efl_ui_text.eo
index 470c218..e9579e9 100644
--- a/src/lib/elementary/efl_ui_text.eo
+++ b/src/lib/elementary/efl_ui_text.eo
@@ -281,18 +281,6 @@ class Efl.Ui.Text (Elm.Layout, Elm.Interface_Scrollable,
Efl.Ui.Clickable,
enabled: bool; [[If $enabled is $true, the return key is
automatically disabled when the entry has no text.]]
}
}
- @property imf_context {
- get {
- [[Returns the input method context of the entry.
-
- This function exposes the internal input method context.
-
- IMPORTANT: Many functions may change (i.e delete and create a
new one)
- the internal input method context. Do NOT cache the returned
object.
- ]]
- return: void_ptr; [[Input method context]]
- }
- }
item_provider_prepend {
[[This prepends a custom item provider to the list for that entry
@@ -309,13 +297,6 @@ class Efl.Ui.Text (Elm.Layout, Elm.Interface_Scrollable,
Efl.Ui.Clickable,
This API can be used in the case of manually controlling by using
@.input_panel_enabled.set(en, $false).
]]
}
- imf_context_reset {
- [[Reset the input method context of the entry if needed.
-
- This can be necessary in the case where modifying the buffer would
confuse on-going input method behavior.
- This will typically cause the Input Method Context to clear the
preedit state.
- ]]
- }
selection_copy {
[[This executes a "copy" action on the selected text in the entry.]]
}
--
