diff options
| author | Tomi Korpipaa <tomi.korpipaa@qt.io> | 2019-01-30 08:55:17 +0200 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@qt.io> | 2019-01-30 11:32:10 +0000 |
| commit | 410cd933be319f0f79e63aac368636e0988291c3 (patch) | |
| tree | b486e461115e6f1387fcf362b18c15dcf93dfccf /src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderUIPSharedTranslation.h | |
| parent | 9b3f171a0256936452c23834539594ce8b3ed70e (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: I82afd0da38fd3f59a70d1c09e79fc99e0351eb5b
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderUIPSharedTranslation.h')
| -rw-r--r-- | src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderUIPSharedTranslation.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderUIPSharedTranslation.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderUIPSharedTranslation.h index cf2fd378..22b2f909 100644 --- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderUIPSharedTranslation.h +++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderUIPSharedTranslation.h @@ -106,6 +106,12 @@ namespace render { }; template <> + struct SEnumParseMap<TextElide::Enum> + { + static SEnumNameMap *GetMap(); + }; + + template <> struct SEnumParseMap<AAModeValues::Enum> { static SEnumNameMap *GetMap(); @@ -452,7 +458,7 @@ namespace render { HANDLE_QT3DS_RENDER_ENUM_PROPERTY(Text, DropShadowVerticalAlignment, TextDirty) \ HANDLE_QT3DS_RENDER_ENUM_PROPERTY(Text, WordWrap, TextDirty) \ HANDLE_QT3DS_RENDER_REAL_VEC2_PROPERTY(Text, BoundingBox, TextDirty) \ - HANDLE_QT3DS_RENDER_PROPERTY(Text, Elide, TextDirty) \ + HANDLE_QT3DS_RENDER_ENUM_PROPERTY(Text, Elide, TextDirty) \ HANDLE_QT3DS_RENDER_COLOR_VEC3_PROPERTY(Text, TextColor, Dirty) \ HANDLE_QT3DS_RENDER_COLOR_PROPERTY(Text, TextColor, Dirty) \ HANDLE_QT3DS_RENDER_PROPERTY(Text, EnableAcceleratedFont, Dirty) |