seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Tree and FileSystemList edit popup double events and ESC behavior.

Browse Source
This commit is contained in:
bruvzg
2024-05-17 10:03:52 +03:00
parent f4b047a084
commit 7d4d63b807
5 changed files with 52 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
editor/filesystem_dock.cpp
View File

@ -79,6 +79,15 @@ Control *FileSystemList::make_custom_tooltip(const String &p_text) const {
}
void FileSystemList::_line_editor_submit(const String &p_text) {
if (popup_edit_commited) {
return; // Already processed by _text_editor_popup_modal_close
}
if (popup_editor->get_hide_reason() == Popup::HIDE_REASON_CANCELED) {
return; // ESC pressed, app focus lost, or forced close from code.
}
popup_edit_commited = true; // End edit popup processing.
popup_editor->hide();
emit_signal(SNAME("item_edited"));
@ -127,6 +136,7 @@ bool FileSystemList::edit_selected() {
line_editor->set_text(name);
line_editor->select(0, name.rfind("."));
popup_edit_commited = false; // Start edit popup processing.
popup_editor->popup();
popup_editor->child_controls_changed();
line_editor->grab_focus();
@ -138,8 +148,12 @@ String FileSystemList::get_edit_text() {
}
void FileSystemList::_text_editor_popup_modal_close() {
if (popup_edit_commited) {
return; // Already processed by _text_editor_popup_modal_close
}
if (popup_editor->get_hide_reason() == Popup::HIDE_REASON_CANCELED) {
return;
return; // ESC pressed, app focus lost, or forced close from code.
}
_line_editor_submit(line_editor->get_text());