Update enum editor when enum data changes

Add enumDataChanged signal and update editor when enum data or names
change. Adjust stagger axis labels based on map orientation.

Author: bjorn

src/tiled/propertiesview.cpp

@@ -645,20 +645,31 @@ QWidget *BaseEnumProperty::createEnumEditor(QWidget *parent)
 {
     auto editor = new ComboBox(parent);
 
-    for (qsizetype i = 0; i < m_enumData.names.size(); ++i) {
-        auto value = m_enumData.values.value(i, i);
-        editor->addItem(m_enumData.icons[value],
-                        m_enumData.names[i],
-                        value);
-    }
+    auto setupEditor = [this, editor] {
+        const QSignalBlocker blocker(editor);
+        editor->clear();
+
+        for (qsizetype i = 0; i < m_enumData.names.size(); ++i) {
+            auto value = m_enumData.values.value(i, i);
+            editor->addItem(m_enumData.icons[value],
+                            m_enumData.names[i],
+                            value);
+        }
+    };
 
     auto syncEditor = [this, editor] {
         const QSignalBlocker blocker(editor);
         editor->setCurrentIndex(editor->findData(value()));
     };
+
+    setupEditor();
     syncEditor();
 
     QObject::connect(this, &Property::valueChanged, editor, syncEditor);
+    QObject::connect(this, &BaseEnumProperty::enumDataChanged, editor, [=] {
+        setupEditor();
+        syncEditor();
+    });
     QObject::connect(editor, &QComboBox::currentIndexChanged, this,
                      [editor, this] {
         setValue(editor->currentData().toInt());
@@ -667,6 +678,21 @@ QWidget *BaseEnumProperty::createEnumEditor(QWidget *parent)
     return editor;
 }
 
+void BaseEnumProperty::setEnumData(const EnumData &enumData)
+{
+    m_enumData = enumData;
+    emit enumDataChanged(m_enumData);
+}
+
+void BaseEnumProperty::setEnumNames(const QStringList &names)
+{
+    if (m_enumData.names == names)
+        return;
+
+    m_enumData.names = names;
+    emit enumDataChanged(m_enumData);
+}
+
 QWidget *BaseEnumProperty::createFlagsEditor(QWidget *parent)
 {
     auto editor = new QWidget(parent);

src/tiled/propertiesview.h

@@ -22,6 +22,7 @@
 
 #include <QHash>
 #include <QIcon>
+#include <QMap>
 #include <QPointer>
 #include <QScrollArea>
 #include <QString>
@@ -490,7 +491,8 @@ class BaseEnumProperty : public IntProperty
 public:
     using IntProperty::IntProperty;
 
-    void setEnumData(const EnumData &enumData) { m_enumData = enumData; }
+    void setEnumData(const EnumData &enumData);
+    void setEnumNames(const QStringList &names);
     void setFlags(bool flags) { m_flags = flags; }
 
     QWidget *createEditor(QWidget *parent) override
@@ -499,6 +501,9 @@ class BaseEnumProperty : public IntProperty
                        : createEnumEditor(parent);
     }
 
+signals:
+    void enumDataChanged(const EnumData &enumData);
+
 protected:
     QWidget *createFlagsEditor(QWidget *parent);
     QWidget *createEnumEditor(QWidget *parent);

src/tiled/propertieswidget.cpp

@@ -865,9 +865,11 @@ class MapProperties : public ObjectProperties
         mMapProperties->addProperty(mRenderOrderProperty);
         mMapProperties->addProperty(mBackgroundColorProperty);
 
+        updateStaggerAxisLabels();
+        updateEnabledState();
+
         addProperty(mMapProperties);
 
-        updateEnabledState();
         connect(document, &Document::changed,
                 this, &MapProperties::onChanged);
     }
@@ -899,6 +901,7 @@ class MapProperties : public ObjectProperties
             emit mParallaxOriginProperty->valueChanged();
             break;
         case Map::OrientationProperty:
+            updateStaggerAxisLabels();
             emit mOrientationProperty->valueChanged();
             break;
         case Map::RenderOrderProperty:
@@ -946,6 +949,24 @@ class MapProperties : public ObjectProperties
         }
     }
 
+    void updateStaggerAxisLabels()
+    {
+        switch (map()->orientation()) {
+        case Map::Hexagonal:
+            mStaggerAxisProperty->setEnumNames({
+                tr("X (Flat-top)"),
+                tr("Y (Pointy-top)")
+            });
+            break;
+        default:
+            mStaggerAxisProperty->setEnumNames({
+                tr("X"),
+                tr("Y")
+            });
+            break;
+        }
+    }
+
     MapDocument *mapDocument() const
     {
         return static_cast<MapDocument*>(mDocument);
@@ -962,7 +983,7 @@ class MapProperties : public ObjectProperties
     SizeProperty *mTileSizeProperty;
     BoolProperty *mInfiniteProperty;
     IntProperty *mHexSideLengthProperty;
-    Property *mStaggerAxisProperty;
+    BaseEnumProperty *mStaggerAxisProperty;
     Property *mStaggerIndexProperty;
     Property *mParallaxOriginProperty;
     Property *mLayerDataFormatProperty;