summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-03-08 10:55:11 -0500
committerCedric BAIL <cedric.bail@free.fr>2019-03-08 12:18:01 -0800
commit6d40a78b25807beb47d22081914bd58326d43fec (patch)
treefc810ba9b8f9d0a2121daf00445df0c05756f93f
parent51cc6513bf5d107b4a6e936c7ce7046ccc08928c (diff)
elm.code.widget: rename events to avoid conflicts
Reviewed-by: Cedric BAIL <cedric.bail@free.fr> Differential Revision: https://phab.enlightenment.org/D8264
-rw-r--r--src/lib/elementary/elm_code_widget.c4
-rw-r--r--src/lib/elementary/elm_code_widget.eo12
-rw-r--r--src/lib/elementary/elm_code_widget_selection.c16
3 files changed, 16 insertions, 16 deletions
diff --git a/src/lib/elementary/elm_code_widget.c b/src/lib/elementary/elm_code_widget.c
index 4456eb48f7..0720a5253b 100644
--- a/src/lib/elementary/elm_code_widget.c
+++ b/src/lib/elementary/elm_code_widget.c
@@ -2429,8 +2429,8 @@ _elm_code_widget_efl_canvas_group_group_add(Eo *obj, Elm_Code_Widget_Data *pd)
2429 2429
2430 efl_event_callback_add(obj, &ELM_CODE_EVENT_LINE_LOAD_DONE, _elm_code_widget_line_cb, obj); 2430 efl_event_callback_add(obj, &ELM_CODE_EVENT_LINE_LOAD_DONE, _elm_code_widget_line_cb, obj);
2431 efl_event_callback_add(obj, &ELM_CODE_EVENT_FILE_LOAD_DONE, _elm_code_widget_file_cb, obj); 2431 efl_event_callback_add(obj, &ELM_CODE_EVENT_FILE_LOAD_DONE, _elm_code_widget_file_cb, obj);
2432 efl_event_callback_add(obj, EFL_UI_CODE_WIDGET_EVENT_SELECTION_CHANGED, _elm_code_widget_selection_cb, obj); 2432 efl_event_callback_add(obj, EFL_UI_CODE_WIDGET_EVENT_CODE_SELECTION_CHANGED, _elm_code_widget_selection_cb, obj);
2433 efl_event_callback_add(obj, EFL_UI_CODE_WIDGET_EVENT_SELECTION_CLEARED, _elm_code_widget_selection_clear_cb, obj); 2433 efl_event_callback_add(obj, EFL_UI_CODE_WIDGET_EVENT_CODE_SELECTION_CLEARED, _elm_code_widget_selection_clear_cb, obj);
2434} 2434}
2435 2435
2436/* Internal EO APIs and hidden overrides */ 2436/* Internal EO APIs and hidden overrides */
diff --git a/src/lib/elementary/elm_code_widget.eo b/src/lib/elementary/elm_code_widget.eo
index 650913f781..5258621f5e 100644
--- a/src/lib/elementary/elm_code_widget.eo
+++ b/src/lib/elementary/elm_code_widget.eo
@@ -334,11 +334,11 @@ class Elm.Code_Widget extends Efl.Ui.Layout_Base
334 changed,user: void; [[Called when object changed due to user interaction]] 334 changed,user: void; [[Called when object changed due to user interaction]]
335 /* FIXME: All events below send the obj in the event_info, which is redundant */ 335 /* FIXME: All events below send the obj in the event_info, which is redundant */
336 cursor,changed: Elm.Code_Widget; [[Called when cursor changed]] 336 cursor,changed: Elm.Code_Widget; [[Called when cursor changed]]
337 selection,start: Elm.Code_Widget; [[Called when a selection is started]] 337 code,selection,start: Elm.Code_Widget; [[Called when a selection is started]]
338 selection,changed: Elm.Code_Widget; [[Called when selection changed]] 338 code,selection,changed: Elm.Code_Widget; [[Called when selection changed]]
339 selection,cleared: Elm.Code_Widget; [[Called when selection was cleared]] 339 code,selection,cleared: Elm.Code_Widget; [[Called when selection was cleared]]
340 selection,cut: Elm.Code_Widget; [[Called when a cut action is performed]] 340 code,selection,cut: Elm.Code_Widget; [[Called when a cut action is performed]]
341 selection,copy: Elm.Code_Widget; [[Called when a copy action is performed]] 341 code,selection,copy: Elm.Code_Widget; [[Called when a copy action is performed]]
342 selection,paste: Elm.Code_Widget; [[Called when a paste action is performed]] 342 code,selection,paste: Elm.Code_Widget; [[Called when a paste action is performed]]
343 } 343 }
344} 344}
diff --git a/src/lib/elementary/elm_code_widget_selection.c b/src/lib/elementary/elm_code_widget_selection.c
index 7ee3964a21..674f466c33 100644
--- a/src/lib/elementary/elm_code_widget_selection.c
+++ b/src/lib/elementary/elm_code_widget_selection.c
@@ -62,7 +62,7 @@ elm_code_widget_selection_start(Evas_Object *widget,
62 62
63 pd->selection->start_line = line; 63 pd->selection->start_line = line;
64 pd->selection->start_col = col; 64 pd->selection->start_col = col;
65 efl_event_callback_legacy_call(widget, EFL_UI_CODE_WIDGET_EVENT_SELECTION_START, widget); 65 efl_event_callback_legacy_call(widget, EFL_UI_CODE_WIDGET_EVENT_CODE_SELECTION_START, widget);
66} 66}
67 67
68EAPI void 68EAPI void
@@ -90,7 +90,7 @@ elm_code_widget_selection_end(Evas_Object *widget,
90 90
91 pd->selection->end_line = line; 91 pd->selection->end_line = line;
92 pd->selection->end_col = col; 92 pd->selection->end_col = col;
93 efl_event_callback_legacy_call(widget, EFL_UI_CODE_WIDGET_EVENT_SELECTION_CHANGED, widget); 93 efl_event_callback_legacy_call(widget, EFL_UI_CODE_WIDGET_EVENT_CODE_SELECTION_CHANGED, widget);
94} 94}
95 95
96EAPI void 96EAPI void
@@ -110,7 +110,7 @@ elm_code_widget_selection_select_all(Evas_Object *widget)
110 110
111 elm_code_widget_selection_end(widget, maxrow, last_col); 111 elm_code_widget_selection_end(widget, maxrow, last_col);
112 112
113 efl_event_callback_legacy_call(widget, EFL_UI_CODE_WIDGET_EVENT_SELECTION_CHANGED, widget); 113 efl_event_callback_legacy_call(widget, EFL_UI_CODE_WIDGET_EVENT_CODE_SELECTION_CHANGED, widget);
114} 114}
115 115
116EAPI Elm_Code_Widget_Selection_Data * 116EAPI Elm_Code_Widget_Selection_Data *
@@ -166,7 +166,7 @@ elm_code_widget_selection_clear(Evas_Object *widget)
166 166
167 free(pd->selection); 167 free(pd->selection);
168 pd->selection = NULL; 168 pd->selection = NULL;
169 efl_event_callback_legacy_call(widget, EFL_UI_CODE_WIDGET_EVENT_SELECTION_CLEARED, widget); 169 efl_event_callback_legacy_call(widget, EFL_UI_CODE_WIDGET_EVENT_CODE_SELECTION_CLEARED, widget);
170} 170}
171 171
172static void 172static void
@@ -292,7 +292,7 @@ _elm_code_widget_selection_delete_do(Evas_Object *widget, Eina_Bool undo)
292 pd->selection = NULL; 292 pd->selection = NULL;
293 free(selection); 293 free(selection);
294 294
295 efl_event_callback_legacy_call(widget, EFL_UI_CODE_WIDGET_EVENT_SELECTION_CLEARED, widget); 295 efl_event_callback_legacy_call(widget, EFL_UI_CODE_WIDGET_EVENT_CODE_SELECTION_CLEARED, widget);
296 elm_code_widget_cursor_position_set(widget, row, col); 296 elm_code_widget_cursor_position_set(widget, row, col);
297} 297}
298 298
@@ -425,7 +425,7 @@ elm_code_widget_selection_cut(Evas_Object *widget)
425 425
426 elm_code_widget_selection_delete(widget); 426 elm_code_widget_selection_delete(widget);
427 427
428 efl_event_callback_legacy_call(widget, EFL_UI_CODE_WIDGET_EVENT_SELECTION_CUT, widget); 428 efl_event_callback_legacy_call(widget, EFL_UI_CODE_WIDGET_EVENT_CODE_SELECTION_CUT, widget);
429 efl_event_callback_legacy_call(widget, EFL_UI_CODE_WIDGET_EVENT_CHANGED_USER, NULL); 429 efl_event_callback_legacy_call(widget, EFL_UI_CODE_WIDGET_EVENT_CHANGED_USER, NULL);
430} 430}
431 431
@@ -442,7 +442,7 @@ elm_code_widget_selection_copy(Evas_Object *widget)
442 elm_cnp_selection_loss_callback_set(widget, ELM_SEL_TYPE_CLIPBOARD, _selection_loss_cb, widget); 442 elm_cnp_selection_loss_callback_set(widget, ELM_SEL_TYPE_CLIPBOARD, _selection_loss_cb, widget);
443 free(text); 443 free(text);
444 444
445 efl_event_callback_legacy_call(widget, EFL_UI_CODE_WIDGET_EVENT_SELECTION_COPY, widget); 445 efl_event_callback_legacy_call(widget, EFL_UI_CODE_WIDGET_EVENT_CODE_SELECTION_COPY, widget);
446} 446}
447 447
448static Eina_Bool 448static Eina_Bool
@@ -454,7 +454,7 @@ _selection_paste_cb(void *data, Evas_Object *obj EINA_UNUSED, Elm_Selection_Data
454 454
455 elm_code_widget_text_at_cursor_insert(widget, ev->data); 455 elm_code_widget_text_at_cursor_insert(widget, ev->data);
456 456
457 efl_event_callback_legacy_call(widget, EFL_UI_CODE_WIDGET_EVENT_SELECTION_PASTE, widget); 457 efl_event_callback_legacy_call(widget, EFL_UI_CODE_WIDGET_EVENT_CODE_SELECTION_PASTE, widget);
458 return EINA_TRUE; 458 return EINA_TRUE;
459} 459}
460 460