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

elm_code: Fix undo code for deleting tab 

When character can take up more than 1 column we had to
handle delete and backspace with care
This commit is contained in:
Andy Williams 2016-05-18 23:36:47 +01:00
parent dcd56607a9
commit e16ab050c8
3 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1172,7 +1172,7 @@ _elm_code_widget_backspace(Elm_Code_Widget *widget)
Elm_Code *code;
Elm_Code_Line *line;
Elm_Code_Widget_Change_Info *change;
unsigned int row, col, position, start_col, char_width;
unsigned int row, col, position, start_col, end_col, char_width;
const char *text;
if (_elm_code_widget_delete_selection(widget))
@ -1193,17 +1193,18 @@ _elm_code_widget_backspace(Elm_Code_Widget *widget)
line = elm_code_file_line_get(code->file, row);
position = elm_code_widget_line_text_position_for_column_get(widget, line, col);
end_col = elm_code_widget_line_text_column_width_to_position(widget, line, position);
start_col = elm_code_widget_line_text_column_width_to_position(widget, line,
elm_code_widget_line_text_position_for_column_get(widget, line, col - 1));
char_width = position - elm_code_widget_line_text_position_for_column_get(widget, line, start_col);
text = elm_code_widget_text_between_positions_get(widget, start_col, row, start_col, row);
text = elm_code_widget_text_between_positions_get(widget, start_col, row, end_col, row);
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);
change = _elm_code_widget_change_create(start_col, row, col, row, text, char_width, EINA_FALSE);
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);
_elm_code_widget_change_free(change);
}
@ -1214,7 +1215,7 @@ _elm_code_widget_delete(Elm_Code_Widget *widget)
Elm_Code *code;
Elm_Code_Line *line;
Elm_Code_Widget_Change_Info *change;
unsigned int row, col, position, char_width, start_col;
unsigned int row, col, position, char_width, start_col, end_col;
const char *text;
if (_elm_code_widget_delete_selection(widget))
@ -1234,10 +1235,13 @@ _elm_code_widget_delete(Elm_Code_Widget *widget)
position = elm_code_widget_line_text_position_for_column_get(widget, line, col);
char_width = elm_code_widget_line_text_position_for_column_get(widget, line, col + 1) - position;
if (char_width == 0) // a partial tab
char_width = 1;
start_col = elm_code_widget_line_text_column_width_to_position(widget, line, position);
end_col = elm_code_widget_line_text_column_width_to_position(widget, line, position + char_width);
text = elm_code_widget_text_between_positions_get(widget, start_col, row, start_col, row);
elm_code_line_text_remove(line, position, char_width?char_width:1);
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);

12
elm_code/src/lib/widget/elm_code_widget_undo.c
View File

@ -37,10 +37,6 @@ static void
_elm_code_widget_undo_change(Evas_Object *widget,
Elm_Code_Widget_Change_Info *info)
{
Elm_Code_Line *line;
Elm_Code_Widget_Data *pd;
unsigned int position;
if (info->insert)
{
elm_code_widget_selection_start(widget, info->start_line, info->start_col);
@ -49,12 +45,8 @@ _elm_code_widget_undo_change(Evas_Object *widget,
}
else
{
pd = eo_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
line = elm_code_file_line_get(pd->code->file, info->start_line);
position = elm_code_widget_line_text_position_for_column_get(widget, line, info->start_col);
elm_code_line_text_insert(line, position, info->content, info->length);
elm_code_widget_cursor_position_set(widget, info->end_col, info->end_line);
elm_code_widget_cursor_position_set(widget, info->start_col, info->start_line);
_elm_code_widget_text_at_cursor_insert(widget, info->content, info->length);
}
}

17
elm_code/src/tests/widget/elm_code_test_widget_undo.c
View File

@ -133,6 +133,23 @@ START_TEST (elm_code_test_widget_undo_delete)
content = elm_code_line_text_get(line, &length);
ck_assert_strn_eq("test", content, length);
elm_code_widget_cursor_position_set(widget, 4, 1);
_elm_code_widget_text_at_cursor_insert(widget, "\t", 1);
_elm_code_widget_backspace(widget);
content = elm_code_line_text_get(line, &length);
ck_assert_strn_eq("test", content, length);
elm_code_widget_undo(widget);
content = elm_code_line_text_get(line, &length);
ck_assert_strn_eq("tes\tt", content, length);
elm_code_widget_cursor_position_set(widget, 4, 1);
_elm_code_widget_delete(widget);
content = elm_code_line_text_get(line, &length);
ck_assert_strn_eq("test", content, length);
elm_code_widget_undo(widget);
content = elm_code_line_text_get(line, &length);
ck_assert_strn_eq("tes\tt", content, length);
elm_code_free(code);
elm_shutdown();
}