diff options
| author | Tomi Korpipaa <tomi.korpipaa@qt.io> | 2019-01-30 09:13:06 +0200 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@qt.io> | 2019-01-30 11:32:18 +0000 |
| commit | 07a76635ce20a10cd3995fea9e6716536a5c3684 (patch) | |
| tree | 960060c7b682c997f19c0d2f3d8efe448c8a4a5e /src/runtime/q3dsuippresentation.cpp | |
| parent | edce6c0f86f18424251e93c16b289a90634a88d2 (diff) | |
Convert text elide property to enum
Elide has option for None, Left, Middle, and Right.
Converting the original boolean to support those.
Task-number: QT3DS-2707
Change-Id: I8bee7b7bb9dc58661663ea7a06cc70baffa3c31b
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/runtime/q3dsuippresentation.cpp')
| -rw-r--r-- | src/runtime/q3dsuippresentation.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/runtime/q3dsuippresentation.cpp b/src/runtime/q3dsuippresentation.cpp index 3e63710..4213e20 100644 --- a/src/runtime/q3dsuippresentation.cpp +++ b/src/runtime/q3dsuippresentation.cpp @@ -1239,6 +1239,12 @@ bool parseProperty(const V &attrs, Q3DSGraphObject::PropSetFlags flags, const QS return ::parseProperty<Q3DSTextNode::WordWrap>(attrs, flags, typeName, propName, Q3DS::Enum, dst, [](const QStringRef &s, Q3DSTextNode::WordWrap *v) { return Q3DSEnumMap::enumFromStr(s, v); }); } +template<typename V> +bool parseProperty(const V &attrs, Q3DSGraphObject::PropSetFlags flags, const QString &typeName, const QString &propName, Q3DSTextNode::Elide *dst) +{ + return ::parseProperty<Q3DSTextNode::Elide>(attrs, flags, typeName, propName, Q3DS::Enum, dst, [](const QStringRef &s, Q3DSTextNode::Elide *v) { return Q3DSEnumMap::enumFromStr(s, v); }); +} + // Resolving of object references should be deferred. setProperties() is // expected to just store the string, and only look up the object in // resolveReferences() using this helper. @@ -3692,7 +3698,7 @@ Q3DSPropertyChange Q3DSTextNode::setWordWrap(WordWrap v) return createPropSetter(m_wordWrap, v, "wordwrap"); } -Q3DSPropertyChange Q3DSTextNode::setElide(bool v) +Q3DSPropertyChange Q3DSTextNode::setElide(Elide v) { return createPropSetter(m_elide, v, "elide"); } |