asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #15063 from poke1024/textedit-select-last-line

Browse source 
Fix key down on last line in TextEdit
This commit is contained in:
Rémi Verschelde 2018-01-03 10:30:51 +01:00 committed by GitHub
commit 592b0fc068
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
scene/gui/text_edit.cpp
View file

@ -2725,6 +2725,8 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) {
_scroll_lines_down();
break;
}
{
#else
if (k->get_command() && k->get_alt()) {
_scroll_lines_down();
@ -2733,9 +2735,15 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) {
if (k->get_command())
cursor_set_line(text.size() - 1, true, false);
else
else {
#endif
cursor_set_line(cursor_get_line() + num_lines_from(CLAMP(cursor.line + 1, 0, text.size() - 1), 1), true, false);
if (!is_last_visible_line(cursor.line)) {
cursor_set_line(cursor_get_line() + num_lines_from(CLAMP(cursor.line + 1, 0, text.size() - 1), 1), true, false);
} else {
cursor_set_line(text.size() - 1);
cursor_set_column(get_line(cursor.line).length(), true);
}
}
if (k->get_shift())
_post_shift_selection();
@ -4584,6 +4592,24 @@ int TextEdit::num_lines_from(int p_line_from, int unhidden_amount) const {
return num_total;
}
bool TextEdit::is_last_visible_line(int p_line) const {
ERR_FAIL_INDEX_V(p_line, text.size(), false);
if (p_line == text.size() - 1)
return true;
if (!is_hiding_enabled())
return false;
for (int i = p_line + 1; i < text.size(); i++) {
if (!is_line_hidden(i))
return false;
}
return true;
}
int TextEdit::get_indent_level(int p_line) const {
ERR_FAIL_INDEX_V(p_line, text.size(), 0);

1
scene/gui/text_edit.h
View file

@ -433,6 +433,7 @@ public:
void fold_all_lines();
void unhide_all_lines();
int num_lines_from(int p_line_from, int unhidden_amount) const;
bool is_last_visible_line(int p_line) const;
bool can_fold(int p_line) const;
bool is_folded(int p_line) const;
void fold_line(int p_line);