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

Merge pull request #94033 from Hilderin/fix-ctrl-space-script-editor-add-space

Browse source 
Fix custom Ctrl-Space shortcut in Script Editor adds a space
This commit is contained in:
Rémi Verschelde 2024-07-07 21:58:46 +02:00
commit 85e994bffb
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
editor/editor_node.cpp
View file

@ -317,14 +317,10 @@ void EditorNode::shortcut_input(const Ref<InputEvent> &p_event) {
Ref<InputEventKey> k = p_event;
if ((k.is_valid() && k->is_pressed() && !k->is_echo()) || Object::cast_to<InputEventShortcut>(*p_event)) {
EditorPlugin *old_editor = editor_plugin_screen;
bool is_handled = true;
if (ED_IS_SHORTCUT("editor/filter_files", p_event)) {
FileSystemDock::get_singleton()->focus_on_filter();
get_tree()->get_root()->set_input_as_handled();
}
if (ED_IS_SHORTCUT("editor/editor_2d", p_event)) {
} else if (ED_IS_SHORTCUT("editor/editor_2d", p_event)) {
editor_select(EDITOR_2D);
} else if (ED_IS_SHORTCUT("editor/editor_3d", p_event)) {
editor_select(EDITOR_3D);
@ -343,9 +339,10 @@ void EditorNode::shortcut_input(const Ref<InputEvent> &p_event) {
} else if (ED_IS_SHORTCUT("editor/toggle_last_opened_bottom_panel", p_event)) {
bottom_panel->toggle_last_opened_bottom_panel();
} else {
is_handled = false;
}
if (old_editor != editor_plugin_screen) {
if (is_handled) {
get_tree()->get_root()->set_input_as_handled();
}
}