summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-03-08 10:56:07 -0500
committerCedric BAIL <cedric.bail@free.fr>2019-03-08 12:18:04 -0800
commit3eb121a769b873a38f909f4069271cd9058b3137 (patch)
tree5d6eb5d694aa12f6ee1f244e5c25c247b82dbeb0
parent6d40a78b25807beb47d22081914bd58326d43fec (diff)
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.eo2
-rw-r--r--src/lib/elementary/efl_ui_internal_text_interactive.c4
-rw-r--r--src/lib/elementary/efl_ui_text.c4
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,
48 } 48 }
49 } 49 }
50 events { 50 events {
51 selection,changed: void; [[The selection on the object has changed. Query using @.selection_cursors]] 51 text,selection,changed: void; [[The selection on the object has changed. Query using @.selection_cursors]]
52 } 52 }
53} 53}
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
558 free(en->selection); 558 free(en->selection);
559 en->selection = NULL; 559 en->selection = NULL;
560 } 560 }
561 efl_event_callback_call(o, EFL_TEXT_INTERACTIVE_EVENT_SELECTION_CHANGED, NULL); 561 efl_event_callback_call(o, EFL_TEXT_INTERACTIVE_EVENT_TEXT_SELECTION_CHANGED, NULL);
562} 562}
563 563
564static void 564static void
@@ -574,7 +574,7 @@ _sel_clear(Evas_Object *o EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en
574 { 574 {
575 en->have_selection = EINA_FALSE; 575 en->have_selection = EINA_FALSE;
576 efl_text_cursor_copy(o, en->sel_start, en->sel_end); 576 efl_text_cursor_copy(o, en->sel_start, en->sel_end);
577 efl_event_callback_call(o, EFL_TEXT_INTERACTIVE_EVENT_SELECTION_CHANGED, NULL); 577 efl_event_callback_call(o, EFL_TEXT_INTERACTIVE_EVENT_TEXT_SELECTION_CHANGED, NULL);
578 } 578 }
579} 579}
580 580
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)
2131 text_obj = efl_add(EFL_UI_INTERNAL_TEXT_INTERACTIVE_CLASS, obj); 2131 text_obj = efl_add(EFL_UI_INTERNAL_TEXT_INTERACTIVE_CLASS, obj);
2132 efl_event_callback_forwarder_add(text_obj, EFL_UI_TEXT_EVENT_CHANGED_USER, obj); 2132 efl_event_callback_forwarder_add(text_obj, EFL_UI_TEXT_EVENT_CHANGED_USER, obj);
2133 efl_event_callback_forwarder_add(text_obj, EFL_UI_TEXT_EVENT_CHANGED, obj); 2133 efl_event_callback_forwarder_add(text_obj, EFL_UI_TEXT_EVENT_CHANGED, obj);
2134 efl_event_callback_forwarder_add(text_obj, EFL_TEXT_INTERACTIVE_EVENT_SELECTION_CHANGED, obj); 2134 efl_event_callback_forwarder_add(text_obj, EFL_TEXT_INTERACTIVE_EVENT_TEXT_SELECTION_CHANGED, obj);
2135 sd->text_obj = text_obj; 2135 sd->text_obj = text_obj;
2136 sd->text_guide_obj = efl_add(EFL_CANVAS_TEXT_CLASS, obj); 2136 sd->text_guide_obj = efl_add(EFL_CANVAS_TEXT_CLASS, obj);
2137 sd->text_table = efl_add(EFL_UI_TABLE_CLASS, obj); 2137 sd->text_table = efl_add(EFL_UI_TABLE_CLASS, obj);
@@ -2199,7 +2199,7 @@ _efl_ui_text_efl_object_finalize(Eo *obj,
2199 _efl_ui_text_changed_user_cb, obj); 2199 _efl_ui_text_changed_user_cb, obj);
2200 efl_event_callback_add(sd->text_obj, EFL_CANVAS_TEXT_EVENT_CHANGED, 2200 efl_event_callback_add(sd->text_obj, EFL_CANVAS_TEXT_EVENT_CHANGED,
2201 _efl_ui_text_changed_cb, obj); 2201 _efl_ui_text_changed_cb, obj);
2202 efl_event_callback_add(sd->text_obj, EFL_TEXT_INTERACTIVE_EVENT_SELECTION_CHANGED, 2202 efl_event_callback_add(sd->text_obj, EFL_TEXT_INTERACTIVE_EVENT_TEXT_SELECTION_CHANGED,
2203 _efl_ui_text_selection_changed_cb, obj); 2203 _efl_ui_text_selection_changed_cb, obj);
2204 efl_event_callback_add(sd->text_obj, EFL_CANVAS_TEXT_EVENT_CURSOR_CHANGED, 2204 efl_event_callback_add(sd->text_obj, EFL_CANVAS_TEXT_EVENT_CURSOR_CHANGED,
2205 _efl_ui_text_cursor_changed_cb, obj); 2205 _efl_ui_text_cursor_changed_cb, obj);