summaryrefslogtreecommitdiffstats
path: root/src/runtime/q3dsuippresentation_p.h
diff options
context:
space:
mode:
authorTomi Korpipaa <tomi.korpipaa@qt.io>2019-01-15 11:09:02 +0200
committerTomi Korpipää <tomi.korpipaa@qt.io>2019-01-16 11:15:10 +0000
commit4af66e46efed6630ccc202c1e47dec6f3926d38c (patch)
tree9e111a7fb5fd03bdc287510a4b383b141d28b91c /src/runtime/q3dsuippresentation_p.h
parent985d370e4750810633fa324a5f030e42607ffb93 (diff)
Add elide property parsing
This task does not handle eliding itself, it just adds support for passing it from the editor to the runtime. Eliding itself can be handled after QT3DS-1419 is done. Task-number: QT3DS-2707 Change-Id: I55da680daaeb54e6e6b7cd6c4dedce17026ff303 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'src/runtime/q3dsuippresentation_p.h')
-rw-r--r--src/runtime/q3dsuippresentation_p.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/runtime/q3dsuippresentation_p.h b/src/runtime/q3dsuippresentation_p.h
index afdbeba..e483004 100644
--- a/src/runtime/q3dsuippresentation_p.h
+++ b/src/runtime/q3dsuippresentation_p.h
@@ -1556,6 +1556,7 @@ class Q3DSV_PRIVATE_EXPORT Q3DSTextNode : public Q3DSNode
Q_PROPERTY(VerticalAlignment shadowVertAlign READ shadowVerticalAlignment WRITE setShadowVerticalAlignment) // To be removed in 2.x (when UIP version is next updated)
Q_PROPERTY(QVector2D boundingBox READ boundingBox WRITE setBoundingBox)
Q_PROPERTY(WordWrap wordWrap READ wordWrap WRITE setWordWrap)
+ Q_PROPERTY(bool elide READ elide WRITE setElide)
public:
enum HorizontalAlignment {
Left = 0,
@@ -1606,6 +1607,7 @@ public:
VerticalAlignment shadowVerticalAlignment() const { return m_shadowVertAlign; } // To be removed in 2.x (when UIP version is next updated)
QVector2D boundingBox() const { return m_boundingBox; }
WordWrap wordWrap() const { return m_wordWrap; }
+ bool elide() const { return m_elide; }
Q3DSPropertyChange setText(const QString &v);
Q3DSPropertyChange setColor(const QColor &v);
@@ -1624,6 +1626,7 @@ public:
Q3DSPropertyChange setShadowVerticalAlignment(VerticalAlignment v); // To be removed in 2.x (when UIP version is next updated)
Q3DSPropertyChange setBoundingBox(const QVector2D &v);
Q3DSPropertyChange setWordWrap(WordWrap v);
+ Q3DSPropertyChange setElide(bool v);
private:
Q_DISABLE_COPY(Q3DSTextNode)
@@ -1646,6 +1649,7 @@ private:
VerticalAlignment m_shadowVertAlign = Bottom; // To be removed in 2.x (when UIP version is next updated)
QVector2D m_boundingBox;
WordWrap m_wordWrap = WrapWord;
+ bool m_elide = false;
};
class Q3DSV_PRIVATE_EXPORT Q3DSDefaultMaterial : public Q3DSGraphObject