From d69aad68f037123cf6d467258c6e19cbbefab69f Mon Sep 17 00:00:00 2001 From: WooHyun Jung Date: Tue, 7 Jan 2020 05:35:10 +0000 Subject: [PATCH] efl_text_change_info: rename some properties insert -> insertion merge -> mergeable ref T7933 Reviewed-by: Marcel Hollerbach Differential Revision: https://phab.enlightenment.org/D11016 --- src/lib/efl/interfaces/efl_text_types.eot | 6 +++--- src/lib/elementary/efl_ui_internal_text_interactive.c | 16 ++++++++-------- src/lib/elementary/efl_ui_textbox.c | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/lib/efl/interfaces/efl_text_types.eot b/src/lib/efl/interfaces/efl_text_types.eot index 362486f..de03d8d 100644 --- a/src/lib/efl/interfaces/efl_text_types.eot +++ b/src/lib/efl/interfaces/efl_text_types.eot @@ -24,8 +24,8 @@ struct @beta Efl.Text_Change_Info { content: string; [[The content added/removed]] position: size; [[The position where it was added/removed]] length: size; [[The length of content in characters (not bytes, actual unicode characters)]] - insert: bool; [[$true if the content was inserted, $false if removei]] - merge: bool; [[$true if can be merged with the previous one. Used for example with insertion when something is already selected]] + insertion: bool; [[$true if the content was inserted, $false if removed]] + mergeable: bool; [[$true if can be merged with the previous one. Used for example with insertion when something is already selected]] } struct @beta Efl.Text_Range { @@ -33,4 +33,4 @@ struct @beta Efl.Text_Range { ]] start: int; [[The start postion.]] end: int; [[The end position.]] -} \ No newline at end of file +} diff --git a/src/lib/elementary/efl_ui_internal_text_interactive.c b/src/lib/elementary/efl_ui_internal_text_interactive.c index 4958a83..3212632 100644 --- a/src/lib/elementary/efl_ui_internal_text_interactive.c +++ b/src/lib/elementary/efl_ui_internal_text_interactive.c @@ -263,7 +263,7 @@ _text_filter_markup_prepend_internal(Efl_Canvas_Textblock *obj, Efl_Ui_Internal_ if (changeinfo) { info = calloc(1, sizeof(*info)); - info->insert = EINA_TRUE; + info->insertion = EINA_TRUE; info->content = eina_stringshare_add(text); info->length = eina_unicode_utf8_get_len(info->content); @@ -272,7 +272,7 @@ _text_filter_markup_prepend_internal(Efl_Canvas_Textblock *obj, Efl_Ui_Internal_ { if (have_sel) { - info->merge = EINA_TRUE; + info->mergeable = EINA_TRUE; } info->position = efl_text_cursor_position_get(efl_text_interactive_main_cursor_get(obj)); @@ -589,7 +589,7 @@ _entry_imf_event_delete_surrounding_cb(void *data, Ecore_IMF_Context *ctx EINA_U tmp = efl_text_cursor_range_text_get(del_start, del_end); - info.insert = EINA_FALSE; + info.insertion = EINA_FALSE; info.position = start; info.length = end - start; info.content = tmp; @@ -880,7 +880,7 @@ _range_del_emit(Evas_Object *obj, Efl_Text_Cursor *cur1, Efl_Text_Cursor *cur2) if (start == end) return; - info.insert = EINA_FALSE; + info.insertion = EINA_FALSE; info.position = start; info.length = end - start; @@ -926,7 +926,7 @@ _delete_emit(Eo *obj, Efl_Text_Cursor *c, Efl_Ui_Internal_Text_Interactive_Data Efl_Text_Change_Info info = { NULL, 0, 0, 0, 0 }; char *tmp = NULL; - info.insert = EINA_FALSE; + info.insertion = EINA_FALSE; if (backspace) { @@ -972,7 +972,7 @@ _delete_emit(Eo *obj, Efl_Text_Cursor *c, Efl_Ui_Internal_Text_Interactive_Data evas_textblock_cursor_free(cc); } - info.insert = EINA_FALSE; + info.insertion = EINA_FALSE; info.position = pos; info.length = 1; info.content = tmp; @@ -1452,9 +1452,9 @@ _key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void if (en->have_selection) { _sel_range_del_emit(obj, en); - info.merge = EINA_TRUE; + info.mergeable = EINA_TRUE; } - info.insert = EINA_TRUE; + info.insertion = EINA_TRUE; info.content = string; info.position = efl_text_cursor_position_get(cur); info.length = eina_unicode_utf8_get_len(string); diff --git a/src/lib/elementary/efl_ui_textbox.c b/src/lib/elementary/efl_ui_textbox.c index aa9a17f..5493db0 100644 --- a/src/lib/elementary/efl_ui_textbox.c +++ b/src/lib/elementary/efl_ui_textbox.c @@ -536,7 +536,7 @@ _selection_data_cb(void *data EINA_UNUSED, Eo *obj, efl_text_interactive_all_unselect(obj); } cur = efl_text_interactive_main_cursor_get(obj); - info.insert = EINA_TRUE; + info.insertion = EINA_TRUE; info.position = efl_text_cursor_position_get(cur); info.length = len; info.content = buf; @@ -2199,7 +2199,7 @@ _efl_ui_textbox_selection_cut(Eo *obj, Efl_Ui_Textbox_Data *sd) start_pos = efl_text_cursor_position_get(start); end_pos = efl_text_cursor_position_get(end); tmp = efl_text_cursor_range_text_get(start, end); - info.insert = EINA_FALSE; + info.insertion = EINA_FALSE; info.position = start_pos; info.length = end_pos - start_pos; info.content = tmp; -- 2.7.4