From 07a00cf82274c6fb96345947a150f32ff6b399db Mon Sep 17 00:00:00 2001 From: kobewi Date: Wed, 20 Sep 2023 12:39:41 +0200 Subject: Don't allow transforming scene tiles --- editor/plugins/tiles/tile_map_editor.cpp | 36 +++++++++++++++++++++++--------- editor/plugins/tiles/tile_map_editor.h | 1 + scene/resources/tile_set.h | 1 + 3 files changed, 28 insertions(+), 10 deletions(-) diff --git a/editor/plugins/tiles/tile_map_editor.cpp b/editor/plugins/tiles/tile_map_editor.cpp index f5f405d576..69b702bf3f 100644 --- a/editor/plugins/tiles/tile_map_editor.cpp +++ b/editor/plugins/tiles/tile_map_editor.cpp @@ -107,17 +107,33 @@ void TileMapEditorTilesPlugin::_update_transform_buttons() { return; } - if (tile_set->get_tile_shape() == TileSet::TILE_SHAPE_SQUARE || selection_pattern->get_size() == Vector2i(1, 1)) { - transform_button_rotate_left->set_disabled(false); - transform_button_rotate_left->set_tooltip_text(""); - transform_button_rotate_right->set_disabled(false); - transform_button_rotate_right->set_tooltip_text(""); + bool has_scene_tile = false; + for (const KeyValue &E : selection_pattern->get_pattern()) { + if (Object::cast_to(tile_set->get_source(E.value.source_id).ptr())) { + has_scene_tile = true; + break; + } + } + + if (has_scene_tile) { + _set_transform_buttons_state({}, { transform_button_rotate_left, transform_button_rotate_right, transform_button_flip_h, transform_button_flip_v }, + TTR("Can't transform scene tiles.")); + } else if (tile_set->get_tile_shape() != TileSet::TILE_SHAPE_SQUARE && selection_pattern->get_size() != Vector2i(1, 1)) { + _set_transform_buttons_state({ transform_button_flip_h, transform_button_flip_v }, { transform_button_rotate_left, transform_button_rotate_right }, + TTR("Can't rotate patterns when using non-square tile grid.")); } else { - const String tooltip_text = TTR("Can't rotate patterns when using non-square tile grid."); - transform_button_rotate_left->set_disabled(true); - transform_button_rotate_left->set_tooltip_text(tooltip_text); - transform_button_rotate_right->set_disabled(true); - transform_button_rotate_right->set_tooltip_text(tooltip_text); + _set_transform_buttons_state({ transform_button_rotate_left, transform_button_rotate_right, transform_button_flip_h, transform_button_flip_v }, {}, ""); + } +} + +void TileMapEditorTilesPlugin::_set_transform_buttons_state(const Vector