diff options
| author | Mike Blumenkrantz <zmike@samsung.com> | 2019-03-08 10:56:07 -0500 |
|---|---|---|
| committer | Cedric BAIL <cedric.bail@free.fr> | 2019-03-08 12:18:04 -0800 |
| commit | 3eb121a769b873a38f909f4069271cd9058b3137 (patch) | |
| tree | 5d6eb5d694aa12f6ee1f244e5c25c247b82dbeb0 | |
| parent | 6d40a78b25807beb47d22081914bd58326d43fec (diff) | |
| download | efl-3eb121a769b873a38f909f4069271cd9058b3137.tar.gz | |
efl.text.interactive: rename events to avoid conflicts
Reviewed-by: Cedric BAIL <cedric.bail@free.fr>
Differential Revision: https://phab.enlightenment.org/D8265
| -rw-r--r-- | src/lib/elementary/efl_text_interactive.eo | 2 | ||||
| -rw-r--r-- | src/lib/elementary/efl_ui_internal_text_interactive.c | 4 | ||||
| -rw-r--r-- | src/lib/elementary/efl_ui_text.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/elementary/efl_text_interactive.eo b/src/lib/elementary/efl_text_interactive.eo index 8d2d444a34..4d8d96d832 100644 --- a/src/lib/elementary/efl_text_interactive.eo +++ b/src/lib/elementary/efl_text_interactive.eo @@ -48,6 +48,6 @@ interface @beta Efl.Text_Interactive extends Efl.Text, Efl.Text_Font, } } events { - selection,changed: void; [[The selection on the object has changed. Query using @.selection_cursors]] + text,selection,changed: void; [[The selection on the object has changed. Query using @.selection_cursors]] } } diff --git a/src/lib/elementary/efl_ui_internal_text_interactive.c b/src/lib/elementary/efl_ui_internal_text_interactive.c index eaada5c2a4..9d7fdedf6f 100644 --- a/src/lib/elementary/efl_ui_internal_text_interactive.c +++ b/src/lib/elementary/efl_ui_internal_text_interactive.c @@ -558,7 +558,7 @@ _sel_extend(Evas_Textblock_Cursor *c, Evas_Object *o, Efl_Ui_Internal_Text_Inter free(en->selection); en->selection = NULL; } - efl_event_callback_call(o, EFL_TEXT_INTERACTIVE_EVENT_SELECTION_CHANGED, NULL); + efl_event_callback_call(o, EFL_TEXT_INTERACTIVE_EVENT_TEXT_SELECTION_CHANGED, NULL); } static void @@ -574,7 +574,7 @@ _sel_clear(Evas_Object *o EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en { en->have_selection = EINA_FALSE; efl_text_cursor_copy(o, en->sel_start, en->sel_end); - efl_event_callback_call(o, EFL_TEXT_INTERACTIVE_EVENT_SELECTION_CHANGED, NULL); + efl_event_callback_call(o, EFL_TEXT_INTERACTIVE_EVENT_TEXT_SELECTION_CHANGED, NULL); } } diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c index b5a93634f0..56533f70a4 100644 --- a/src/lib/elementary/efl_ui_text.c +++ b/src/lib/elementary/efl_ui_text.c @@ -2131,7 +2131,7 @@ _efl_ui_text_efl_object_constructor(Eo *obj, Efl_Ui_Text_Data *sd) text_obj = efl_add(EFL_UI_INTERNAL_TEXT_INTERACTIVE_CLASS, obj); efl_event_callback_forwarder_add(text_obj, EFL_UI_TEXT_EVENT_CHANGED_USER, obj); efl_event_callback_forwarder_add(text_obj, EFL_UI_TEXT_EVENT_CHANGED, obj); - efl_event_callback_forwarder_add(text_obj, EFL_TEXT_INTERACTIVE_EVENT_SELECTION_CHANGED, obj); + efl_event_callback_forwarder_add(text_obj, EFL_TEXT_INTERACTIVE_EVENT_TEXT_SELECTION_CHANGED, obj); sd->text_obj = text_obj; sd->text_guide_obj = efl_add(EFL_CANVAS_TEXT_CLASS, obj); sd->text_table = efl_add(EFL_UI_TABLE_CLASS, obj); @@ -2199,7 +2199,7 @@ _efl_ui_text_efl_object_finalize(Eo *obj, _efl_ui_text_changed_user_cb, obj); efl_event_callback_add(sd->text_obj, EFL_CANVAS_TEXT_EVENT_CHANGED, _efl_ui_text_changed_cb, obj); - efl_event_callback_add(sd->text_obj, EFL_TEXT_INTERACTIVE_EVENT_SELECTION_CHANGED, + efl_event_callback_add(sd->text_obj, EFL_TEXT_INTERACTIVE_EVENT_TEXT_SELECTION_CHANGED, _efl_ui_text_selection_changed_cb, obj); efl_event_callback_add(sd->text_obj, EFL_CANVAS_TEXT_EVENT_CURSOR_CHANGED, _efl_ui_text_cursor_changed_cb, obj); |