diff options
| author | Tomi Korpipaa <tomi.korpipaa@qt.io> | 2019-01-15 11:09:02 +0200 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@qt.io> | 2019-01-16 11:15:10 +0000 |
| commit | 4af66e46efed6630ccc202c1e47dec6f3926d38c (patch) | |
| tree | 9e111a7fb5fd03bdc287510a4b383b141d28b91c /src/runtime/q3dsuippresentation.cpp | |
| parent | 985d370e4750810633fa324a5f030e42607ffb93 (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.cpp')
| -rw-r--r-- | src/runtime/q3dsuippresentation.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/runtime/q3dsuippresentation.cpp b/src/runtime/q3dsuippresentation.cpp index f0424c8..3e63710 100644 --- a/src/runtime/q3dsuippresentation.cpp +++ b/src/runtime/q3dsuippresentation.cpp @@ -3558,6 +3558,7 @@ void Q3DSTextNode::setProps(const V &attrs, PropSetFlags flags) parseProperty(attrs, flags, typeName, QStringLiteral("dropshadowvertalign"), &m_shadowVertAlign); // To be removed in 2.x (when UIP version is next updated) parseSizeProperty(attrs, flags, typeName, QStringLiteral("boundingbox"), &m_boundingBox); parseProperty(attrs, flags, typeName, QStringLiteral("wordwrap"), &m_wordWrap); + parseProperty(attrs, flags, typeName, QStringLiteral("elide"), &m_elide); // Different default value. parseProperty(attrs, flags, typeName, QStringLiteral("name"), &m_name); @@ -3590,6 +3591,8 @@ int Q3DSTextNode::mapChangeFlags(const Q3DSPropertyChangeList &changeList) const || it->nameStr() == QLatin1String("dropshadowhorzalign") // To be removed in 2.x (when UIP version is next updated) || it->nameStr() == QLatin1String("dropshadowvertalign") // To be removed in 2.x (when UIP version is next updated) || it->nameStr() == QLatin1String("boundingbox") + || it->nameStr() == QLatin1String("wordwrap") + || it->nameStr() == QLatin1String("elide") || it->nameStr() == QLatin1String("size") || it->nameStr() == QLatin1String("font") || it->nameStr() == QLatin1String("horzalign") @@ -3689,6 +3692,11 @@ Q3DSPropertyChange Q3DSTextNode::setWordWrap(WordWrap v) return createPropSetter(m_wordWrap, v, "wordwrap"); } +Q3DSPropertyChange Q3DSTextNode::setElide(bool v) +{ + return createPropSetter(m_elide, v, "elide"); +} + Q3DSAliasNode::Q3DSAliasNode() : Q3DSNode(Q3DSNode::Alias) { |