Skip to content

Fix dock opening focus #113296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
akien-mga merged 1 commit into from
Dec 5, 2025
+11 −5
Merged

Fix dock opening focus #113296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions doc/classes/EditorDock.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
<return type="void" />
<description>
Opens the dock. It will appear in the last used dock slot. If the dock has no default slot, it will be opened floating.
[b]Note:[/b] This does not focus the dock. If you want to open and focus the dock, use [method make_visible].
</description>
</method>
</methods>
Expand Down
2 changes: 1 addition & 1 deletion editor/docks/editor_dock.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ EditorDock::EditorDock() {

void EditorDock::open() {
if (!is_open) {
EditorDockManager::get_singleton()->open_dock(this);
EditorDockManager::get_singleton()->open_dock(this, false);
}
}

Expand Down
12 changes: 8 additions & 4 deletions editor/scene/2d/tiles/tiles_editor_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,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(true);
tile_set_plugin_singleton->make_visible_no_focus();
tile_set_id = tile_set->get_instance_id();
} else if (tile_set.is_null()) {
tile_set_plugin_singleton->edit(nullptr);
Expand Down Expand Up @@ -411,7 +411,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(true);
tile_set_plugin_singleton->make_visible_no_focus();
tile_set_id = tile_set->get_instance_id();
} else {
tile_set_plugin_singleton->edit(nullptr);
Expand Down Expand Up @@ -480,7 +480,7 @@ bool TileMapEditorPlugin::handles(Object *p_object) const {

void TileMapEditorPlugin::make_visible(bool p_visible) {
if (p_visible) {
editor->open();
editor->make_visible();
} else {
editor->close();
}
Expand Down Expand Up @@ -533,12 +533,16 @@ bool TileSetEditorPlugin::handles(Object *p_object) const {

void TileSetEditorPlugin::make_visible(bool p_visible) {
if (p_visible) {
editor->open();
editor->make_visible();
} else {
editor->close();
}
}

void TileSetEditorPlugin::make_visible_no_focus() {
editor->open();
}

ObjectID TileSetEditorPlugin::get_edited_tileset() const {
return edited_tileset;
}
Expand Down
1 change: 1 addition & 0 deletions editor/scene/2d/tiles/tiles_editor_plugin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ class TileSetEditorPlugin : public EditorPlugin {
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();
Expand Down