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

Merge pull request #93165 from passivestar/scenetree-shortcut-focus

Browse Source 
Prevent node rename shortcut from stealing focus from controls
This commit is contained in:
Rémi Verschelde
2024-07-17 11:42:38 +02:00
parent 97b8ad1af0 09f967bc00
commit ef3443ef35
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
editor/scene_tree_dock.cpp
View File

@@ -149,7 +149,8 @@ void SceneTreeDock::input(const Ref<InputEvent> &p_event) {
void SceneTreeDock::shortcut_input(const Ref<InputEvent> &p_event) {
ERR_FAIL_COND(p_event.is_null());
if (get_viewport()->gui_get_focus_owner() && get_viewport()->gui_get_focus_owner()->is_text_field()) {
Control *focus_owner = get_viewport()->gui_get_focus_owner();
if (focus_owner && focus_owner->is_text_field()) {
return;
}
@@ -158,7 +159,11 @@ void SceneTreeDock::shortcut_input(const Ref<InputEvent> &p_event) {
}
if (ED_IS_SHORTCUT("scene_tree/rename", p_event)) {
_tool_selected(TOOL_RENAME);
// Prevent renaming if a button is focused
// to avoid conflict with Enter shortcut on macOS
if (!focus_owner || !Object::cast_to<BaseButton>(focus_owner)) {
_tool_selected(TOOL_RENAME);
}
#ifdef MODULE_REGEX_ENABLED
} else if (ED_IS_SHORTCUT("scene_tree/batch_rename", p_event)) {
_tool_selected(TOOL_BATCH_RENAME);