Skip to content

Fix TileSet dock becoming focused when switching TileMapLayers #114994

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
Jan 16, 2026
Merged

Fix TileSet dock becoming focused when switching TileMapLayers #114994

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
6 changes: 5 additions & 1 deletion 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 @@ -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->open_editor();
tile_set_id = tile_set->get_instance_id();
} else {
tile_set_plugin_singleton->edit(nullptr);
Expand Down Expand Up @@ -540,6 +540,10 @@ void TileSetEditorPlugin::make_visible(bool p_visible) {
}
}

void TileSetEditorPlugin::open_editor() {
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 @@ -164,6 +164,7 @@ class TileSetEditorPlugin : public EditorPlugin {
virtual void edit(Object *p_object) override;
virtual bool handles(Object *p_object) const override;
virtual void make_visible(bool p_visible) override;
void open_editor();

ObjectID get_edited_tileset() const;

Expand Down
Loading