Fix custom shortcut Ctrl-Space in Script Editor add a space
This commit is contained in:
parent
f3af22b10b
commit
a7c4522c04
1 changed files with 4 additions and 7 deletions
|
@ -317,14 +317,10 @@ void EditorNode::shortcut_input(const Ref<InputEvent> &p_event) {
|
||||||
|
|
||||||
Ref<InputEventKey> k = p_event;
|
Ref<InputEventKey> k = p_event;
|
||||||
if ((k.is_valid() && k->is_pressed() && !k->is_echo()) || Object::cast_to<InputEventShortcut>(*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)) {
|
if (ED_IS_SHORTCUT("editor/filter_files", p_event)) {
|
||||||
FileSystemDock::get_singleton()->focus_on_filter();
|
FileSystemDock::get_singleton()->focus_on_filter();
|
||||||
get_tree()->get_root()->set_input_as_handled();
|
} else if (ED_IS_SHORTCUT("editor/editor_2d", p_event)) {
|
||||||
}
|
|
||||||
|
|
||||||
if (ED_IS_SHORTCUT("editor/editor_2d", p_event)) {
|
|
||||||
editor_select(EDITOR_2D);
|
editor_select(EDITOR_2D);
|
||||||
} else if (ED_IS_SHORTCUT("editor/editor_3d", p_event)) {
|
} else if (ED_IS_SHORTCUT("editor/editor_3d", p_event)) {
|
||||||
editor_select(EDITOR_3D);
|
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)) {
|
} else if (ED_IS_SHORTCUT("editor/toggle_last_opened_bottom_panel", p_event)) {
|
||||||
bottom_panel->toggle_last_opened_bottom_panel();
|
bottom_panel->toggle_last_opened_bottom_panel();
|
||||||
} else {
|
} else {
|
||||||
|
is_handled = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (old_editor != editor_plugin_screen) {
|
if (is_handled) {
|
||||||
get_tree()->get_root()->set_input_as_handled();
|
get_tree()->get_root()->set_input_as_handled();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue