vtorri
/
edi
forked from enlightenment/edi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

elm_code: Fix build for updated eolian_gen output

This commit is contained in:
Andy Williams 2016-05-19 22:17:52 +01:00
parent e16ab050c8
commit def75fb0e8
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
elm_code/src/bin/elm_code_test_main.c
View File

@ -69,7 +69,7 @@ _elm_code_test_welcome_setup(Evas_Object *parent)
widget = eo_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(eo_self, code));
elm_obj_code_widget_font_set(widget, NULL, 12);
eo_event_callback_add(widget, &ELM_CODE_EVENT_LINE_LOAD_DONE, _elm_code_test_line_done_cb, NULL);
eo_event_callback_add(widget, ELM_CODE_WIDGET_EVENT_LINE_CLICKED, _elm_code_test_line_clicked_cb, code);
eo_event_callback_add(widget, ELM_OBJ_CODE_WIDGET_EVENT_LINE_CLICKED, _elm_code_test_line_clicked_cb, code);
_append_line(code->file, "❤ Hello World, Elm Code! ❤");
_append_line(code->file, "");

22
elm_code/src/lib/widget/elm_code_widget.c
View File

@ -597,7 +597,7 @@ _elm_code_widget_cursor_move(Elm_Code_Widget *widget, Elm_Code_Widget_Data *pd,
if (!was_key)
_elm_code_widget_update_focus_directions(widget);
eo_event_callback_call(widget, ELM_CODE_WIDGET_EVENT_CURSOR_CHANGED, widget);
eo_event_callback_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_CURSOR_CHANGED, widget);
_elm_code_widget_cursor_ensure_visible(widget);
if (oldrow != pd->cursor_line)
@ -668,7 +668,7 @@ _elm_code_widget_clicked_gutter_cb(Elm_Code_Widget *widget, unsigned int row)
if (!line)
return;
eo_event_callback_call(widget, ELM_CODE_WIDGET_EVENT_LINE_GUTTER_CLICKED, line);
eo_event_callback_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_LINE_GUTTER_CLICKED, line);
}
static void
@ -704,7 +704,7 @@ _elm_code_widget_clicked_readonly_cb(Elm_Code_Widget *widget, unsigned int row)
if (!line)
return;
eo_event_callback_call(widget, ELM_CODE_WIDGET_EVENT_LINE_CLICKED, line);
eo_event_callback_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_LINE_CLICKED, line);
}
static void
@ -1066,7 +1066,7 @@ _elm_code_widget_text_at_cursor_insert(Elm_Code_Widget *widget, const char *text
// a workaround for when the cursor position would be off the line width
_elm_code_widget_resize(widget, line);
elm_obj_code_widget_cursor_position_set(widget, col + col_width, row);
eo_event_callback_call(widget, ELM_CODE_WIDGET_EVENT_CHANGED_USER, NULL);
eo_event_callback_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_CHANGED_USER, NULL);
change = _elm_code_widget_change_create(col, row, col + col_width - 1, row, text, length, EINA_TRUE);
_elm_code_widget_undo_change_add(widget, change);
@ -1130,7 +1130,7 @@ _elm_code_widget_newline(Elm_Code_Widget *widget)
indent = elm_obj_code_widget_line_text_column_width_to_position(widget, line, leading);
elm_obj_code_widget_cursor_position_set(widget, indent, row + 1);
eo_event_callback_call(widget, ELM_CODE_WIDGET_EVENT_CHANGED_USER, NULL);
eo_event_callback_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_CHANGED_USER, NULL);
change = _elm_code_widget_change_create(width + 1, row, indent - 1, row + 1, "\n", 1, EINA_TRUE);
_elm_code_widget_undo_change_add(widget, change);
@ -1163,7 +1163,7 @@ _elm_code_widget_backspaceline(Elm_Code_Widget *widget, Eina_Bool nextline)
elm_obj_code_widget_cursor_position_set(widget, position, row - 1);
}
// TODO construct and pass a change object
eo_event_callback_call(widget, ELM_CODE_WIDGET_EVENT_CHANGED_USER, NULL);
eo_event_callback_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_CHANGED_USER, NULL);
}
void
@ -1202,7 +1202,7 @@ _elm_code_widget_backspace(Elm_Code_Widget *widget)
elm_code_line_text_remove(line, position - char_width, char_width);
elm_obj_code_widget_cursor_position_set(widget, start_col, row);
eo_event_callback_call(widget, ELM_CODE_WIDGET_EVENT_CHANGED_USER, NULL);
eo_event_callback_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_CHANGED_USER, NULL);
change = _elm_code_widget_change_create(start_col, row, end_col, row, text, char_width, EINA_FALSE);
_elm_code_widget_undo_change_add(widget, change);
@ -1243,7 +1243,7 @@ _elm_code_widget_delete(Elm_Code_Widget *widget)
text = elm_code_widget_text_between_positions_get(widget, start_col, row, end_col, row);
elm_code_line_text_remove(line, position, char_width);
elm_obj_code_widget_cursor_position_set(widget, start_col, row);
eo_event_callback_call(widget, ELM_CODE_WIDGET_EVENT_CHANGED_USER, NULL);
eo_event_callback_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_CHANGED_USER, NULL);
change = _elm_code_widget_change_create(start_col, row, col, row, text, char_width, EINA_FALSE);
_elm_code_widget_undo_change_add(widget, change);
@ -1270,7 +1270,7 @@ _elm_code_widget_control_key_down_cb(Elm_Code_Widget *widget, const char *key)
elm_code_widget_undo(widget);
// TODO construct and pass a change object for cut and paste
eo_event_callback_call(widget, ELM_CODE_WIDGET_EVENT_CHANGED_USER, NULL);
eo_event_callback_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_CHANGED_USER, NULL);
}
static void
@ -1838,8 +1838,8 @@ _elm_code_widget_evas_object_smart_add(Eo *obj, Elm_Code_Widget_Data *pd)
eo_event_callback_add(obj, &ELM_CODE_EVENT_LINE_LOAD_DONE, _elm_code_widget_line_cb, obj);
eo_event_callback_add(obj, &ELM_CODE_EVENT_FILE_LOAD_DONE, _elm_code_widget_file_cb, obj);
eo_event_callback_add(obj, ELM_CODE_WIDGET_EVENT_SELECTION_CHANGED, _elm_code_widget_selection_cb, obj);
eo_event_callback_add(obj, ELM_CODE_WIDGET_EVENT_SELECTION_CLEARED, _elm_code_widget_selection_clear_cb, obj);
eo_event_callback_add(obj, ELM_OBJ_CODE_WIDGET_EVENT_SELECTION_CHANGED, _elm_code_widget_selection_cb, obj);
eo_event_callback_add(obj, ELM_OBJ_CODE_WIDGET_EVENT_SELECTION_CLEARED, _elm_code_widget_selection_clear_cb, obj);
}
#include "elm_code_widget_text.c"

8
elm_code/src/lib/widget/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;
eo_event_callback_call(widget, ELM_CODE_WIDGET_EVENT_SELECTION_CHANGED, widget);
eo_event_callback_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_SELECTION_CHANGED, widget);
elm_obj_code_widget_cursor_position_set(widget, col, line);
}
@ -88,7 +88,7 @@ elm_code_widget_selection_end(Evas_Object *widget,
pd->selection->end_line = line;
pd->selection->end_col = col;
eo_event_callback_call(widget, ELM_CODE_WIDGET_EVENT_SELECTION_CHANGED, widget);
eo_event_callback_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_SELECTION_CHANGED, widget);
}
EAPI Elm_Code_Widget_Selection_Data *
@ -144,7 +144,7 @@ elm_code_widget_selection_clear(Evas_Object *widget)
free(pd->selection);
pd->selection = NULL;
eo_event_callback_call(widget, ELM_CODE_WIDGET_EVENT_SELECTION_CLEARED, widget);
eo_event_callback_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_SELECTION_CLEARED, widget);
}
static void
@ -246,7 +246,7 @@ elm_code_widget_selection_delete(Evas_Object *widget)
free(pd->selection);
pd->selection = NULL;
eo_event_callback_call(widget, ELM_CODE_WIDGET_EVENT_SELECTION_CLEARED, widget);
eo_event_callback_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_SELECTION_CLEARED, widget);
}
EAPI void

4
src/bin/edi_consolepanel.c
View File

@ -344,7 +344,7 @@ void edi_consolepanel_add(Evas_Object *parent)
elm_obj_code_widget_font_set(widget, _edi_project_config->font.name, _edi_project_config->font.size);
elm_obj_code_widget_gravity_set(widget, 0.0, 1.0);
eo_event_callback_add(widget, &ELM_CODE_EVENT_LINE_LOAD_DONE, _edi_consolepanel_line_cb, NULL);
eo_event_callback_add(widget, ELM_CODE_WIDGET_EVENT_LINE_CLICKED, _edi_consolepanel_clicked_cb, code);
eo_event_callback_add(widget, ELM_OBJ_CODE_WIDGET_EVENT_LINE_CLICKED, _edi_consolepanel_clicked_cb, code);
evas_object_size_hint_weight_set(widget, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(widget, EVAS_HINT_FILL, EVAS_HINT_FILL);
@ -369,7 +369,7 @@ void edi_testpanel_add(Evas_Object *parent)
elm_obj_code_widget_font_set(widget, _edi_project_config->font.name, _edi_project_config->font.size);
elm_obj_code_widget_gravity_set(widget, 0.0, 1.0);
eo_event_callback_add(widget, &ELM_CODE_EVENT_LINE_LOAD_DONE, _edi_testpanel_line_cb, NULL);
eo_event_callback_add(widget, ELM_CODE_WIDGET_EVENT_LINE_CLICKED, _edi_consolepanel_clicked_cb, code);
eo_event_callback_add(widget, ELM_OBJ_CODE_WIDGET_EVENT_LINE_CLICKED, _edi_consolepanel_clicked_cb, code);
evas_object_size_hint_weight_set(widget, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(widget, EVAS_HINT_FILL, EVAS_HINT_FILL);