Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #114994 from KoBeWi/tile_set_stop_it,_get_some_help

Browse source 
Fix TileSet dock becoming focused when switching TileMapLayers
This commit is contained in:
Rémi Verschelde 2026-01-16 13:23:30 +01:00
commit 3211de51e2
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
editor/scene/2d/tiles/tiles_editor_plugin.cpp
View file

@ -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);
@ -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;
}

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

@ -164,6 +164,7 @@ public:
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;