From aeb7157277b01c4b7035efd4eeb7599f95daf106 Mon Sep 17 00:00:00 2001 From: David Capello Date: Wed, 22 Nov 2023 16:11:49 -0300 Subject: [PATCH] Fix possibility to edit tileset base index (fix #4163) Regression from 242555ab06c31fb8f00e70e7b83456ff179a5848 --- src/app/ui/tileset_selector.cpp | 4 ++-- src/app/ui/tileset_selector.h | 11 ++++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/app/ui/tileset_selector.cpp b/src/app/ui/tileset_selector.cpp index 08797853e..cb9eed6fe 100644 --- a/src/app/ui/tileset_selector.cpp +++ b/src/app/ui/tileset_selector.cpp @@ -111,10 +111,10 @@ void TilesetSelector::updateControlsState() ts->matchFlags()); } - name()->setEnabled(isNewTileset || !m_info.allowNewTileset); + name()->setEnabled(true); gridWidth()->setEnabled(isNewTileset); gridHeight()->setEnabled(isNewTileset); - baseIndex()->setEnabled(isNewTileset); + baseIndex()->setEnabled(true); } else { tilesets()->setEnabled(false); diff --git a/src/app/ui/tileset_selector.h b/src/app/ui/tileset_selector.h index a4c068eba..8a846c93c 100644 --- a/src/app/ui/tileset_selector.h +++ b/src/app/ui/tileset_selector.h @@ -26,11 +26,16 @@ namespace app { class TilesetSelector : public app::gen::TilesetSelector { public: struct Info { - // Enables/disables the tileset selector combobox + // Enables/disables the tileset selector combobox and fields to + // edit the tileset data. bool enabled = true; - // When false, removes the "New Tileset" option from the tileset selector combobox + + // When false, removes the "New Tileset" option from the tileset + // selector combobox. bool allowNewTileset = true; - // When false, we only can select a "New Tileset" option or change the tileset properties + + // When false, we only can select a "New Tileset" option or + // change the tileset properties. bool allowExistentTileset = true; // Output members that are set when TilesetSelector.getInfo()