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

Fix docks grabbing too much focus

Browse Source
This commit is contained in:
Logan Detrick
2025-12-20 15:15:05 -08:00
parent 551ce8d47f
commit 0e072e9014
4 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
editor/docks/editor_dock.cpp
View File

@@ -116,7 +116,7 @@ void EditorDock::open() {
}
void EditorDock::make_visible() {
EditorDockManager::get_singleton()->focus_dock(this);
EditorDockManager::get_singleton()->open_dock(this, true);
}
void EditorDock::close() {

13
editor/docks/editor_dock_manager.cpp
View File

@@ -844,6 +844,19 @@ void EditorDockManager::open_dock(EditorDock *p_dock, bool p_set_current) {
ERR_FAIL_COND_MSG(!all_docks.has(p_dock), vformat("Cannot open unknown dock '%s'.", p_dock->get_display_title()));
if (p_dock->is_open) {
// Show the dock if it is already open.
if (p_set_current) {
if (p_dock->dock_window) {
p_dock->get_window()->grab_focus();
return;
}
TabContainer *dock_tab_container = get_dock_tab_container(p_dock);
if (dock_tab_container) {
int tab_index = dock_tab_container->get_tab_idx_from_control(p_dock);
dock_tab_container->set_current_tab(tab_index);
}
}
return;
}

8
editor/scene/2d/tiles/tiles_editor_plugin.cpp
View File

@@ -373,7 +373,7 @@ void TileMapEditorPlugin::_update_tile_map() {
Ref<TileSet> tile_set = edited_layer->get_tile_set();
if (tile_set.is_valid() && tile_set_id != tile_set->get_instance_id()) {
tile_set_plugin_singleton->edit(tile_set.ptr());
tile_set_plugin_singleton->make_visible_no_focus();
tile_set_plugin_singleton->make_visible(true);
tile_set_id = tile_set->get_instance_id();
} else if (tile_set.is_null()) {
tile_set_plugin_singleton->edit(nullptr);
@@ -410,7 +410,7 @@ void TileMapEditorPlugin::_edit_tile_map_layer(TileMapLayer *p_tile_map_layer, b
Ref<TileSet> tile_set = p_tile_map_layer->get_tile_set();
if (tile_set.is_valid()) {
tile_set_plugin_singleton->edit(tile_set.ptr());
tile_set_plugin_singleton->make_visible_no_focus();
tile_set_plugin_singleton->make_visible(true);
tile_set_id = tile_set->get_instance_id();
} else {
tile_set_plugin_singleton->edit(nullptr);
@@ -539,10 +539,6 @@ void TileSetEditorPlugin::make_visible(bool p_visible) {
}
}
void TileSetEditorPlugin::make_visible_no_focus() {
editor->open();
}
ObjectID TileSetEditorPlugin::get_edited_tileset() const {
return edited_tileset;
}

1
editor/scene/2d/tiles/tiles_editor_plugin.h
View File

@@ -165,7 +165,6 @@ public:
virtual bool handles(Object *p_object) const override;
virtual void make_visible(bool p_visible) override;
void make_visible_no_focus();
ObjectID get_edited_tileset() const;
TileSetEditorPlugin();