Merge pull request #4045 from bjorn/new-properties-framework

New properties framework.
mapeditor · Jan 12, 2025 · e51770c · e51770c
2 parents dc71c70 + 544ae78
commit e51770c
Show file tree

Hide file tree

Showing 179 changed files with 7,668 additions and 23,418 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -362,6 +362,12 @@ Icons from the Elementary icon theme (GPLv3)
 * src/tiled/images/32/dialog-error.png
 * src/tiled/images/32/dialog-warning.png
 
+Icons from the GNOME project (CC0 1.0 Universal)
+* src/tiled/resources/images/scalable/text-bold-symbolic.svg
+* src/tiled/resources/images/scalable/text-italic-symbolic.svg
+* src/tiled/resources/images/scalable/text-underline-symbolic.svg
+* src/tiled/resources/images/scalable/text-strikethrough-symbolic.svg
+
 
 Tilesets:
 

diff --git a/src/libtiled/imagelayer.cpp b/src/libtiled/imagelayer.cpp
@@ -104,8 +104,7 @@ ImageLayer *ImageLayer::initializeClone(ImageLayer *clone) const
     clone->mImageSource = mImageSource;
     clone->mTransparentColor = mTransparentColor;
     clone->mImage = mImage;
-    clone->mRepeatX = mRepeatX;
-    clone->mRepeatY = mRepeatY;
+    clone->mRepetition = mRepetition;
 
     return clone;
 }
diff --git a/src/libtiled/imagelayer.h b/src/libtiled/imagelayer.h
@@ -46,6 +46,19 @@ namespace Tiled {
 class TILEDSHARED_EXPORT ImageLayer : public Layer
 {
 public:
+    enum Repetition {
+        /**
+         * Makes the image repeat along the X axis.
+         */
+        RepeatX = 0x1,
+
+        /**
+         * Makes the image repeat along the Y axis.
+         */
+        RepeatY = 0x2,
+    };
+    Q_DECLARE_FLAGS(RepetitionFlags, Repetition)
+
     ImageLayer(const QString &name, int x, int y);
     ~ImageLayer() override;
 
@@ -114,25 +127,13 @@ class TILEDSHARED_EXPORT ImageLayer : public Layer
      */
     bool isEmpty() const override;
 
-    /**
-     * Returns true if the image of this layer repeats along the X axis.
-     */
-    bool repeatX() const { return mRepeatX; }
-
-    /**
-     * Returns true if the image of this layer repeats along the Y axis.
-     */
-    bool repeatY() const { return mRepeatY; }
-
-    /**
-     * Sets whether the image of this layer repeats along the X axis.
-     */
-    void setRepeatX(bool repeatX) { mRepeatX = repeatX; }
+    bool repeatX() const { return mRepetition & RepeatX; }
+    bool repeatY() const { return mRepetition & RepeatY; }
+    RepetitionFlags repetition() const { return mRepetition; }
 
-    /**
-     * Sets whether the image of this layer repeats along the Y axis.
-     */
-    void setRepeatY(bool repeatY) { mRepeatY = repeatY; }
+    void setRepeatX(bool repeatX) { mRepetition.setFlag(RepeatX, repeatX); }
+    void setRepeatY(bool repeatY) { mRepetition.setFlag(RepeatY, repeatY); }
+    void setRepetition(RepetitionFlags repetition) { mRepetition = repetition; }
 
     ImageLayer *clone() const override;
 
@@ -143,8 +144,10 @@ class TILEDSHARED_EXPORT ImageLayer : public Layer
     QUrl mImageSource;
     QColor mTransparentColor;
     QPixmap mImage;
-    bool mRepeatX = false;
-    bool mRepeatY = false;
+    RepetitionFlags mRepetition;
 };
 
 } // namespace Tiled
+
+Q_DECLARE_METATYPE(Tiled::ImageLayer::RepetitionFlags)
+Q_DECLARE_OPERATORS_FOR_FLAGS(Tiled::ImageLayer::RepetitionFlags)
diff --git a/src/libtiled/map.h b/src/libtiled/map.h
@@ -78,8 +78,7 @@ class TILEDSHARED_EXPORT Map : public Object
     QString exportFormat;
 
     enum Property {
-        TileWidthProperty,
-        TileHeightProperty,
+        TileSizeProperty,
         InfiniteProperty,
         HexSideLengthProperty,
         StaggerAxisProperty,
@@ -212,6 +211,7 @@ class TILEDSHARED_EXPORT Map : public Object
     void setTileHeight(int height);
 
     QSize tileSize() const;
+    void setTileSize(QSize size);
 
     bool infinite() const;
     void setInfinite(bool infinite);
@@ -455,6 +455,12 @@ inline QSize Map::tileSize() const
     return QSize(mParameters.tileWidth, mParameters.tileHeight);
 }
 
+inline void Map::setTileSize(QSize size)
+{
+    mParameters.tileWidth = size.width();
+    mParameters.tileHeight = size.height();
+}
+
 inline bool Map::infinite() const
 {
     return mParameters.infinite;
@@ -791,3 +797,5 @@ Q_DECLARE_METATYPE(Tiled::Map*)
 Q_DECLARE_METATYPE(Tiled::Map::Orientation)
 Q_DECLARE_METATYPE(Tiled::Map::LayerDataFormat)
 Q_DECLARE_METATYPE(Tiled::Map::RenderOrder)
+Q_DECLARE_METATYPE(Tiled::Map::StaggerAxis)
+Q_DECLARE_METATYPE(Tiled::Map::StaggerIndex)
diff --git a/src/libtiled/object.cpp b/src/libtiled/object.cpp
@@ -40,6 +40,17 @@ Object::~Object()
     delete mEditable;
 }
 
+const ClassPropertyType *Object::classType() const
+{
+    QString objectClassName = className();
+    if (objectClassName.isEmpty() && typeId() == Object::MapObjectType) {
+        auto mapObject = static_cast<const MapObject*>(this);
+        objectClassName = mapObject->effectiveClassName();
+    }
+
+    return propertyTypes().findClassFor(objectClassName, *this);
+}
+
 /**
  * Returns the value of the property \a name, taking into account that it may
  * be inherited from another object or from the class.
@@ -78,32 +89,36 @@ QVariant Object::resolvedProperty(const QString &name) const
 QVariantMap Object::resolvedProperties() const
 {
     QVariantMap allProperties;
+    Tiled::mergeProperties(allProperties, inheritedProperties());
+    return allProperties;
+}
+
+/**
+ * Computes the inherited properties for this object. This excludes the
+ * properties that are directly set on the object.
+ */
+QVariantMap Object::inheritedProperties() const
+{
+    QVariantMap inheritedProperties;
+
     // Insert properties into allProperties in the reverse order that
     // Object::resolvedProperty searches them, to make sure that the
     // same precedence is maintained.
 
-    QString objectClassName = className();
-    if (objectClassName.isEmpty() && typeId() == Object::MapObjectType) {
-        auto mapObject = static_cast<const MapObject*>(this);
-        objectClassName = mapObject->effectiveClassName();
-    }
-
-    if (auto type = propertyTypes().findClassFor(objectClassName, *this))
-        Tiled::mergeProperties(allProperties, type->members);
+    if (auto type = classType())
+        Tiled::mergeProperties(inheritedProperties, type->members);
 
     if (typeId() == Object::MapObjectType) {
         auto mapObject = static_cast<const MapObject*>(this);
 
         if (const Tile *tile = mapObject->cell().tile())
-            Tiled::mergeProperties(allProperties, tile->properties());
+            Tiled::mergeProperties(inheritedProperties, tile->properties());
 
         if (const MapObject *templateObject = mapObject->templateObject())
-            Tiled::mergeProperties(allProperties, templateObject->properties());
+            Tiled::mergeProperties(inheritedProperties, templateObject->properties());
     }
 
-    Tiled::mergeProperties(allProperties, properties());
-
-    return allProperties;
+    return inheritedProperties;
 }
 
 bool Object::setProperty(const QStringList &path, const QVariant &value)

diff --git a/src/libtiled/object.h b/src/libtiled/object.h
@@ -72,6 +72,8 @@ class TILEDSHARED_EXPORT Object
     const QString &className() const;
     void setClassName(const QString &className);
 
+    const ClassPropertyType *classType() const;
+
     /**
      * Returns the properties of this object.
      */
@@ -111,6 +113,7 @@ class TILEDSHARED_EXPORT Object
 
     QVariant resolvedProperty(const QString &name) const;
     QVariantMap resolvedProperties() const;
+    QVariantMap inheritedProperties() const;
 
     /**
      * Returns the value of the object's \a name property, as a string.

diff --git a/src/libtiled/objectgroup.h b/src/libtiled/objectgroup.h
@@ -238,3 +238,4 @@ TILEDSHARED_EXPORT ObjectGroup::DrawOrder drawOrderFromString(const QString &);
 } // namespace Tiled
 
 Q_DECLARE_METATYPE(Tiled::ObjectGroup*)
+Q_DECLARE_METATYPE(Tiled::ObjectGroup::DrawOrder)
diff --git a/src/libtiled/properties.cpp b/src/libtiled/properties.cpp
@@ -105,16 +105,16 @@ bool setPropertyMemberValue(Properties &properties,
     Q_ASSERT(!path.isEmpty());
 
     auto &topLevelName = path.first();
-    auto topLevelValue = properties.value(topLevelName);
 
     if (path.size() > 1) {
+        auto topLevelValue = properties.value(topLevelName);
         if (!setClassPropertyMemberValue(topLevelValue, 1, path, value))
             return false;
+        properties.insert(topLevelName, topLevelValue);
     } else {
-        topLevelValue = value;
+        properties.insert(topLevelName, value);
     }
 
-    properties.insert(topLevelName, topLevelValue);
     return true;
 }
 

diff --git a/src/libtiled/propertytype.h b/src/libtiled/propertytype.h
@@ -155,6 +155,7 @@ class TILEDSHARED_EXPORT ClassPropertyType final : public PropertyType
     int usageFlags = AnyUsage;
     bool memberValuesResolved = true;
     bool drawFill = true;
+
     ClassPropertyType(const QString &name) : PropertyType(PT_Class, name) {}
 
     ExportValue toExportValue(const QVariant &value, const ExportContext &) const override;

diff --git a/src/libtiled/tileset.h b/src/libtiled/tileset.h
@@ -739,5 +739,9 @@ inline void Tileset::setTransformationFlags(TransformationFlags flags)
 
 Q_DECLARE_METATYPE(Tiled::Tileset*)
 Q_DECLARE_METATYPE(Tiled::SharedTileset)
+Q_DECLARE_METATYPE(Tiled::Tileset::Orientation)
+Q_DECLARE_METATYPE(Tiled::Tileset::TileRenderSize)
+Q_DECLARE_METATYPE(Tiled::Tileset::FillMode)
+Q_DECLARE_METATYPE(Tiled::Tileset::TransformationFlags)
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(Tiled::Tileset::TransformationFlags)
diff --git a/src/libtiled/wangset.h b/src/libtiled/wangset.h
@@ -424,5 +424,6 @@ TILEDSHARED_EXPORT WangSet::Type wangSetTypeFromString(const QString &);
 
 } // namespace Tiled
 
-Q_DECLARE_METATYPE(Tiled::WangSet*)
 Q_DECLARE_METATYPE(Tiled::WangId)
+Q_DECLARE_METATYPE(Tiled::WangSet*)
+Q_DECLARE_METATYPE(Tiled::WangSet::Type)
diff --git a/src/qtpropertybrowser/README.TXT b/src/qtpropertybrowser/README.TXT
diff --git a/src/qtpropertybrowser/common.pri b/src/qtpropertybrowser/common.pri
Original file line number	Diff line number	Diff line change
Expand Up		@@ -238,3 +238,4 @@ TILEDSHARED_EXPORT ObjectGroup::DrawOrder drawOrderFromString(const QString &);
		} // namespace Tiled

		Q_DECLARE_METATYPE(Tiled::ObjectGroup*)
		Q_DECLARE_METATYPE(Tiled::ObjectGroup::DrawOrder)