mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-01-06 17:37:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix TileSet not disappearing on deselecting TileMap

Browse Source
This commit is contained in:
kobewi 2023-08-12 00:26:16 +02:00
parent 4714e95896
commit 6b7829b5ff
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
editor/plugins/tiles/tiles_editor_plugin.cpp
View File

@ -362,6 +362,13 @@ void TileMapEditorPlugin::edit(Object *p_object) {
tile_set_plugin_singleton->make_visible(true); tile_set_plugin_singleton->make_visible(true);
edited_tileset = tile_map->get_tileset()->get_instance_id(); edited_tileset = tile_map->get_tileset()->get_instance_id();
} }
} else if (edited_tileset.is_valid()) {
// Hide the TileSet editor, unless another TileSet is being edited.
if (tile_set_plugin_singleton->get_edited_tileset() == edited_tileset) {
tile_set_plugin_singleton->edit(nullptr);
tile_set_plugin_singleton->make_visible(false);
}
edited_tileset = ObjectID();
} }
} }
@ -419,6 +426,11 @@ TileMapEditorPlugin::~TileMapEditorPlugin() {
void TileSetEditorPlugin::edit(Object *p_object) { void TileSetEditorPlugin::edit(Object *p_object) {
editor->edit(Ref<TileSet>(p_object)); editor->edit(Ref<TileSet>(p_object));
if (p_object) {
edited_tileset = p_object->get_instance_id();
} else {
edited_tileset = ObjectID();
}
} }
bool TileSetEditorPlugin::handles(Object *p_object) const { bool TileSetEditorPlugin::handles(Object *p_object) const {
@ -439,6 +451,10 @@ void TileSetEditorPlugin::make_visible(bool p_visible) {
} }
} }
ObjectID TileSetEditorPlugin::get_edited_tileset() const {
return edited_tileset;
}
TileSetEditorPlugin::TileSetEditorPlugin() { TileSetEditorPlugin::TileSetEditorPlugin() {
DEV_ASSERT(tile_map_plugin_singleton); DEV_ASSERT(tile_map_plugin_singleton);
tile_set_plugin_singleton = this; tile_set_plugin_singleton = this;

6
editor/plugins/tiles/tiles_editor_plugin.h
View File

@ -118,7 +118,7 @@ class TileMapEditorPlugin : public EditorPlugin {
TileMap *tile_map = nullptr; TileMap *tile_map = nullptr;
bool tile_map_changed_needs_update = false; bool tile_map_changed_needs_update = false;
ObjectID edited_tileset; ObjectID edited_tileset; // The TileSet associated with the TileMap.
void _tile_map_changed(); void _tile_map_changed();
void _update_tile_map(); void _update_tile_map();
@ -147,11 +147,15 @@ class TileSetEditorPlugin : public EditorPlugin {
TileSetEditor *editor = nullptr; TileSetEditor *editor = nullptr;
Button *button = nullptr; Button *button = nullptr;
ObjectID edited_tileset;
public: public:
virtual void edit(Object *p_object) override; virtual void edit(Object *p_object) override;
virtual bool handles(Object *p_object) const override; virtual bool handles(Object *p_object) const override;
virtual void make_visible(bool p_visible) override; virtual void make_visible(bool p_visible) override;
ObjectID get_edited_tileset() const;
TileSetEditorPlugin(); TileSetEditorPlugin();
~TileSetEditorPlugin(); ~TileSetEditorPlugin();
}; };