godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-30 16:26:50 +00:00
Code Releases Wiki Activity

Fix contextual tileset editor and ensure button is always visible when tileset is available

Browse Source
This commit is contained in:
SaracenOne
2022-02-20 17:24:56 +00:00
parent 91a57b5b6a
commit 04535bdc7d
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -158,6 +158,9 @@ void TilesEditorPlugin::_update_editors() {
// Update the viewport. // Update the viewport.
CanvasItemEditor::get_singleton()->update_viewport(); CanvasItemEditor::get_singleton()->update_viewport();
// Make sure the tile set editor is visible if we have one assigned.
tileset_editor_button->set_visible(is_visible && tile_set.is_valid());
// Update visibility of bottom panel buttons. // Update visibility of bottom panel buttons.
if (tileset_editor_button->is_pressed() && !tile_set.is_valid()) { if (tileset_editor_button->is_pressed() && !tile_set.is_valid()) {
if (tile_map) { if (tile_map) {
@@ -184,12 +187,14 @@ void TilesEditorPlugin::_notification(int p_what) {
} }
void TilesEditorPlugin::make_visible(bool p_visible) { void TilesEditorPlugin::make_visible(bool p_visible) {
if (p_visible) { is_visible = p_visible;
if (is_visible) {
// Disable and hide invalid editors. // Disable and hide invalid editors.
TileMap *tile_map = Object::cast_to<TileMap>(ObjectDB::get_instance(tile_map_id)); TileMap *tile_map = Object::cast_to<TileMap>(ObjectDB::get_instance(tile_map_id));
tileset_editor_button->set_visible(tile_set.is_valid()); tileset_editor_button->set_visible(tile_set.is_valid());
tilemap_editor_button->set_visible(tile_map); tilemap_editor_button->set_visible(tile_map);
if (tile_map) { if (tile_map && !is_editing_tile_set) {
EditorNode::get_singleton()->make_bottom_panel_item_visible(tilemap_editor); EditorNode::get_singleton()->make_bottom_panel_item_visible(tilemap_editor);
} else { } else {
EditorNode::get_singleton()->make_bottom_panel_item_visible(tileset_editor); EditorNode::get_singleton()->make_bottom_panel_item_visible(tileset_editor);
@@ -348,6 +353,8 @@ void TilesEditorPlugin::edit(Object *p_object) {
// Update edited objects. // Update edited objects.
tile_set = Ref<TileSet>(); tile_set = Ref<TileSet>();
is_editing_tile_set = false;
if (p_object) { if (p_object) {
if (p_object->is_class("TileMap")) { if (p_object->is_class("TileMap")) {
tile_map_id = p_object->get_instance_id(); tile_map_id = p_object->get_instance_id();
@@ -362,6 +369,7 @@ void TilesEditorPlugin::edit(Object *p_object) {
tile_map_id = ObjectID(); tile_map_id = ObjectID();
} }
} }
is_editing_tile_set = true;
EditorNode::get_singleton()->make_bottom_panel_item_visible(tileset_editor); EditorNode::get_singleton()->make_bottom_panel_item_visible(tileset_editor);
} }
} }

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

@@ -53,9 +53,12 @@ public:
}; };
private: private:
bool is_visible = false;
bool tile_map_changed_needs_update = false; bool tile_map_changed_needs_update = false;
ObjectID tile_map_id; ObjectID tile_map_id;
Ref<TileSet> tile_set; Ref<TileSet> tile_set;
bool is_editing_tile_set = false;
Button *tilemap_editor_button; Button *tilemap_editor_button;
TileMapEditor *tilemap_editor; TileMapEditor *tilemap_editor;