diff options
| author | Tom Hacohen <tom@stosb.com> | 2016-06-13 10:11:31 +0100 |
|---|---|---|
| committer | Tom Hacohen <tom@stosb.com> | 2016-06-13 10:13:19 +0100 |
| commit | 679c2f89eec55015a44095b22d307a2ace956bc3 (patch) | |
| tree | bac705be69ba19d896807c982a41fb23823ce658 | |
| parent | 627a0e11b0f18414282d73bc34331af6ff6fd4ff (diff) | |
| download | efl-679c2f89eec55015a44095b22d307a2ace956bc3.tar.gz | |
Ui text interactive: Update code to the new canvas text api.
| -rw-r--r-- | src/lib/elementary/efl_ui_internal_text_interactive.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/lib/elementary/efl_ui_internal_text_interactive.c b/src/lib/elementary/efl_ui_internal_text_interactive.c index d270e5150e..834637653f 100644 --- a/src/lib/elementary/efl_ui_internal_text_interactive.c +++ b/src/lib/elementary/efl_ui_internal_text_interactive.c @@ -41,7 +41,7 @@ static void _sel_init(Evas_Textblock_Cursor *c, Evas_Object *o, Efl_Ui_Internal_ static void _sel_enable(Evas_Textblock_Cursor *c EINA_UNUSED, Evas_Object *o EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en); static void _sel_extend(Evas_Textblock_Cursor *c, Evas_Object *o, Efl_Ui_Internal_Text_Interactive_Data *en); static void _sel_clear(Evas_Textblock_Cursor *c EINA_UNUSED, Evas_Object *o EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en); -const char *_entry_selection_get(Efl_Ui_Internal_Text_Interactive_Data *en); +static const char *_entry_selection_get(Efl_Ui_Internal_Text_Interactive *obj, Efl_Ui_Internal_Text_Interactive_Data *en); static void _entry_imf_cursor_info_set(Evas_Textblock_Cursor *cur, Efl_Ui_Internal_Text_Interactive_Data *en); #ifdef HAVE_ECORE_IMF @@ -405,7 +405,7 @@ _entry_imf_retrieve_selection_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, if (en->have_selection) { - selection_text = _entry_selection_get(en); + selection_text = _entry_selection_get(obj, en); if (text) *text = selection_text ? strdup(selection_text) : NULL; @@ -497,12 +497,11 @@ _focus_out_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, voi #endif } -const char * -_entry_selection_get(Efl_Ui_Internal_Text_Interactive_Data *en) +static const char * +_entry_selection_get(Efl_Ui_Internal_Text_Interactive *obj, Efl_Ui_Internal_Text_Interactive_Data *en) { if ((!en->selection) && (en->have_selection)) - en->selection = evas_textblock_cursor_range_text_get - (en->sel_start, en->sel_end, EVAS_TEXTBLOCK_TEXT_MARKUP); + en->selection = efl_canvas_text_range_text_get(obj, en->sel_start, en->sel_end); return en->selection; } |