diff options
| author | Tomi Korpipaa <tomi.korpipaa@qt.io> | 2019-01-10 13:41:59 +0200 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@qt.io> | 2019-01-16 09:59:40 +0000 |
| commit | 3ec8fe881aa46aaf2170fc4417ab45c5a573ada7 (patch) | |
| tree | 9f6ead142f6656900b6fcdce70cea4ae4b612008 /src/Authoring/QT3DSDM/Systems | |
| parent | e943aa20bb05182f0a1d16ba5d236fe5f9486b2c (diff) | |
Add horizontal and vertical offsets for text drop shadows
Keep support for old style offset until UIP version is updated
next time. This change is not critical enough to update the UIP version.
Task-number: QT3DS-2755
Change-Id: I10085862df5a851ed75bc39a58f497ed096f18f7
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Authoring/QT3DSDM/Systems')
| -rw-r--r-- | src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp | 8 | ||||
| -rw-r--r-- | src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.h | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp b/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp index a7921109..e842b0a1 100644 --- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp +++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp @@ -223,9 +223,11 @@ struct DataConstructor<SObjectRefType> #define QT3DS_WCHAR_T_tracking L"tracking" #define QT3DS_WCHAR_T_dropshadow L"dropshadow" #define QT3DS_WCHAR_T_dropshadowstrength L"dropshadowstrength" -#define QT3DS_WCHAR_T_dropshadowoffset L"dropshadowoffset" -#define QT3DS_WCHAR_T_dropshadowhorzalign L"dropshadowhorzalign" -#define QT3DS_WCHAR_T_dropshadowvertalign L"dropshadowvertalign" +#define QT3DS_WCHAR_T_dropshadowoffset L"dropshadowoffset" // To be removed in 2.x (when UIP version is next updated) +#define QT3DS_WCHAR_T_dropshadowoffsetx L"dropshadowoffsetx" +#define QT3DS_WCHAR_T_dropshadowoffsety L"dropshadowoffsety" +#define QT3DS_WCHAR_T_dropshadowhorzalign L"dropshadowhorzalign" // To be removed in 2.x (when UIP version is next updated) +#define QT3DS_WCHAR_T_dropshadowvertalign L"dropshadowvertalign" // To be removed in 2.x (when UIP version is next updated) #define QT3DS_WCHAR_T_wordwrap L"wordwrap" #define QT3DS_WCHAR_T_boundingbox L"boundingbox" #define QT3DS_WCHAR_T_elide L"elide" diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.h b/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.h index f16e163c..1b23b0cb 100644 --- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.h +++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.h @@ -280,6 +280,8 @@ class IPropertySystem; HANDLE_COMPOSER_PROPERTY(dropshadow, m_DropShadow, bool, false) \ HANDLE_COMPOSER_PROPERTY(dropshadowstrength, m_DropShadowStrength, float, 80.f) \ HANDLE_COMPOSER_PROPERTY(dropshadowoffset, m_DropShadowOffset, float, 10.f) \ + HANDLE_COMPOSER_PROPERTY(dropshadowoffsetx, m_DropShadowOffsetX, float, 0.f) \ + HANDLE_COMPOSER_PROPERTY(dropshadowoffsety, m_DropShadowOffsetY, float, 0.f) \ HANDLE_COMPOSER_PROPERTY(dropshadowhorzalign, m_DropShadowHorizontalAlignment, TDataStrPtr, L"Right") \ HANDLE_COMPOSER_PROPERTY(dropshadowvertalign, m_DropShadowVerticalAlignment, TDataStrPtr, L"Bottom") \ HANDLE_COMPOSER_PROPERTY(wordwrap, m_WordWrap, TDataStrPtr, L"WrapWord") \ |