diff options
author | griant <goooosick@gmail.com> | 2019-04-19 15:39:57 +0800 |
---|---|---|
committer | griant <goooosick@gmail.com> | 2019-04-19 15:39:57 +0800 |
commit | eb5807984c12e90dc46e359463db1a178fe8a1c5 (patch) | |
tree | 0c52d30a3f4705e5ee53b8ca5dfb2a0bb65e767c /scene | |
parent | d1c26674eb5827311e6b249f56e1e66b70806bb3 (diff) |
fix improper uncommenting behavior in TextEditor
Diffstat (limited to 'scene')
-rw-r--r-- | scene/gui/text_edit.cpp | 40 | ||||
-rw-r--r-- | scene/gui/text_edit.h | 1 |
2 files changed, 0 insertions, 41 deletions
diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index 39a0b0aaf2..9fdcea2211 100644 --- a/scene/gui/text_edit.cpp +++ b/scene/gui/text_edit.cpp @@ -3103,28 +3103,6 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) { } break; - case KEY_U: { - if (!k->get_command() || k->get_shift()) { - scancode_handled = false; - break; - } else { - if (selection.active) { - int ini = selection.from_line; - int end = selection.to_line; - - for (int i = ini; i <= end; i++) { - _uncomment_line(i); - } - } else { - _uncomment_line(cursor.line); - if (cursor.column >= get_line(cursor.line).length()) { - cursor.column = MAX(0, get_line(cursor.line).length() - 1); - } - } - update(); - } - } break; - default: { scancode_handled = false; @@ -3183,24 +3161,6 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) { } } -void TextEdit::_uncomment_line(int p_line) { - String line_text = get_line(p_line); - for (int i = 0; i < line_text.length(); i++) { - if (line_text[i] == '#') { - _remove_text(p_line, i, p_line, i + 1); - if (p_line == selection.to_line && selection.to_column > line_text.length() - 1) { - selection.to_column -= 1; - if (selection.to_column >= selection.from_column) { - selection.active = false; - } - } - return; - } else if (line_text[i] != '\t' && line_text[i] != ' ') { - return; - } - } -} - void TextEdit::_scroll_up(real_t p_delta) { if (scrolling && smooth_scroll_enabled && SGN(target_v_scroll - v_scroll->get_value()) != SGN(-p_delta)) diff --git a/scene/gui/text_edit.h b/scene/gui/text_edit.h index 96b409c6d4..7e9a76244e 100644 --- a/scene/gui/text_edit.h +++ b/scene/gui/text_edit.h @@ -371,7 +371,6 @@ private: void _update_selection_mode_word(); void _update_selection_mode_line(); - void _uncomment_line(int p_line); void _scroll_up(real_t p_delta); void _scroll_down(real_t p_delta); |