kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

elm.code.widget: rename events to avoid conflicts 

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

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

@ -2429,8 +2429,8 @@ _elm_code_widget_efl_canvas_group_group_add(Eo *obj, Elm_Code_Widget_Data *pd)
efl_event_callback_add(obj, &ELM_CODE_EVENT_LINE_LOAD_DONE, _elm_code_widget_line_cb, obj);
efl_event_callback_add(obj, &ELM_CODE_EVENT_FILE_LOAD_DONE, _elm_code_widget_file_cb, obj);
efl_event_callback_add(obj, EFL_UI_CODE_WIDGET_EVENT_SELECTION_CHANGED, _elm_code_widget_selection_cb, obj);
efl_event_callback_add(obj, EFL_UI_CODE_WIDGET_EVENT_SELECTION_CLEARED, _elm_code_widget_selection_clear_cb, obj);
efl_event_callback_add(obj, EFL_UI_CODE_WIDGET_EVENT_CODE_SELECTION_CHANGED, _elm_code_widget_selection_cb, obj);
efl_event_callback_add(obj, EFL_UI_CODE_WIDGET_EVENT_CODE_SELECTION_CLEARED, _elm_code_widget_selection_clear_cb, obj);
}
/* Internal EO APIs and hidden overrides */

12
src/lib/elementary/elm_code_widget.eo
View File

@ -334,11 +334,11 @@ class Elm.Code_Widget extends Efl.Ui.Layout_Base
changed,user: void; [[Called when object changed due to user interaction]]
/* FIXME: All events below send the obj in the event_info, which is redundant */
cursor,changed: Elm.Code_Widget; [[Called when cursor changed]]
selection,start: Elm.Code_Widget; [[Called when a selection is started]]
selection,changed: Elm.Code_Widget; [[Called when selection changed]]
selection,cleared: Elm.Code_Widget; [[Called when selection was cleared]]
selection,cut: Elm.Code_Widget; [[Called when a cut action is performed]]
selection,copy: Elm.Code_Widget; [[Called when a copy action is performed]]
selection,paste: Elm.Code_Widget; [[Called when a paste action is performed]]
code,selection,start: Elm.Code_Widget; [[Called when a selection is started]]
code,selection,changed: Elm.Code_Widget; [[Called when selection changed]]
code,selection,cleared: Elm.Code_Widget; [[Called when selection was cleared]]
code,selection,cut: Elm.Code_Widget; [[Called when a cut action is performed]]
code,selection,copy: Elm.Code_Widget; [[Called when a copy action is performed]]
code,selection,paste: Elm.Code_Widget; [[Called when a paste action is performed]]
}
}

16
src/lib/elementary/elm_code_widget_selection.c
View File

@ -62,7 +62,7 @@ elm_code_widget_selection_start(Evas_Object *widget,
pd->selection->start_line = line;
pd->selection->start_col = col;
efl_event_callback_legacy_call(widget, EFL_UI_CODE_WIDGET_EVENT_SELECTION_START, widget);
efl_event_callback_legacy_call(widget, EFL_UI_CODE_WIDGET_EVENT_CODE_SELECTION_START, widget);
}
EAPI void
@ -90,7 +90,7 @@ elm_code_widget_selection_end(Evas_Object *widget,
pd->selection->end_line = line;
pd->selection->end_col = col;
efl_event_callback_legacy_call(widget, EFL_UI_CODE_WIDGET_EVENT_SELECTION_CHANGED, widget);
efl_event_callback_legacy_call(widget, EFL_UI_CODE_WIDGET_EVENT_CODE_SELECTION_CHANGED, widget);
}
EAPI void
@ -110,7 +110,7 @@ elm_code_widget_selection_select_all(Evas_Object *widget)
elm_code_widget_selection_end(widget, maxrow, last_col);
efl_event_callback_legacy_call(widget, EFL_UI_CODE_WIDGET_EVENT_SELECTION_CHANGED, widget);
efl_event_callback_legacy_call(widget, EFL_UI_CODE_WIDGET_EVENT_CODE_SELECTION_CHANGED, widget);
}
EAPI Elm_Code_Widget_Selection_Data *
@ -166,7 +166,7 @@ elm_code_widget_selection_clear(Evas_Object *widget)
free(pd->selection);
pd->selection = NULL;
efl_event_callback_legacy_call(widget, EFL_UI_CODE_WIDGET_EVENT_SELECTION_CLEARED, widget);
efl_event_callback_legacy_call(widget, EFL_UI_CODE_WIDGET_EVENT_CODE_SELECTION_CLEARED, widget);
}
static void
@ -292,7 +292,7 @@ _elm_code_widget_selection_delete_do(Evas_Object *widget, Eina_Bool undo)
pd->selection = NULL;
free(selection);
efl_event_callback_legacy_call(widget, EFL_UI_CODE_WIDGET_EVENT_SELECTION_CLEARED, widget);
efl_event_callback_legacy_call(widget, EFL_UI_CODE_WIDGET_EVENT_CODE_SELECTION_CLEARED, widget);
elm_code_widget_cursor_position_set(widget, row, col);
}
@ -425,7 +425,7 @@ elm_code_widget_selection_cut(Evas_Object *widget)
elm_code_widget_selection_delete(widget);
efl_event_callback_legacy_call(widget, EFL_UI_CODE_WIDGET_EVENT_SELECTION_CUT, widget);
efl_event_callback_legacy_call(widget, EFL_UI_CODE_WIDGET_EVENT_CODE_SELECTION_CUT, widget);
efl_event_callback_legacy_call(widget, EFL_UI_CODE_WIDGET_EVENT_CHANGED_USER, NULL);
}
@ -442,7 +442,7 @@ elm_code_widget_selection_copy(Evas_Object *widget)
elm_cnp_selection_loss_callback_set(widget, ELM_SEL_TYPE_CLIPBOARD, _selection_loss_cb, widget);
free(text);
efl_event_callback_legacy_call(widget, EFL_UI_CODE_WIDGET_EVENT_SELECTION_COPY, widget);
efl_event_callback_legacy_call(widget, EFL_UI_CODE_WIDGET_EVENT_CODE_SELECTION_COPY, widget);
}
static Eina_Bool
@ -454,7 +454,7 @@ _selection_paste_cb(void *data, Evas_Object *obj EINA_UNUSED, Elm_Selection_Data
elm_code_widget_text_at_cursor_insert(widget, ev->data);
efl_event_callback_legacy_call(widget, EFL_UI_CODE_WIDGET_EVENT_SELECTION_PASTE, widget);
efl_event_callback_legacy_call(widget, EFL_UI_CODE_WIDGET_EVENT_CODE_SELECTION_PASTE, widget);
return EINA_TRUE;
}