enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

efl.text.interactive: rename events to avoid conflicts 

Reviewed-by: Cedric BAIL <cedric.bail@free.fr>
Differential Revision: https://phab.enlightenment.org/D8265
This commit is contained in:
Mike Blumenkrantz 2019-03-08 10:56:07 -05:00 committed by Cedric BAIL
parent 6d40a78b25
commit 3eb121a769
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/elementary/efl_text_interactive.eo
View File

@ -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]]
}
}

4
src/lib/elementary/efl_ui_internal_text_interactive.c
View File

@ -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);
}
}

4
src/lib/elementary/efl_ui_text.c
View File

@ -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);