diff options
| author | Janne Kangas <janne.kangas@qt.io> | 2019-07-26 14:49:10 +0300 |
|---|---|---|
| committer | Janne Kangas <janne.kangas@qt.io> | 2019-09-11 09:06:10 +0300 |
| commit | 025beb76e9abfba594870ee480448a1fa0a3ca09 (patch) | |
| tree | 65b853dd156ab33000d6bfba1373760730011b40 /src/uipparser | |
| parent | 5665b3264179f97eabe92e77afbd7a3eaaf743f0 (diff) | |
Make visibility setting for elements in master slide persistent
Make datainput-driven visibility setting persistent over slide changes, for
elements that are on master slide. This prevents slide initial value from
overriding the user set visibility. Override takes place at first DI-driven
visibility change.
Change-Id: I799872ebd9834df9e74dd1e5e53a59c57e02255f
Task-id: QT3DS-3925
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'src/uipparser')
| -rw-r--r-- | src/uipparser/Qt3DSUIPParserImpl.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/uipparser/Qt3DSUIPParserImpl.cpp b/src/uipparser/Qt3DSUIPParserImpl.cpp index 60e4317..80187bf 100644 --- a/src/uipparser/Qt3DSUIPParserImpl.cpp +++ b/src/uipparser/Qt3DSUIPParserImpl.cpp @@ -2148,6 +2148,9 @@ BOOL CUIPParserImpl::LoadSlideElementAttrs(IPresentation &inPresentation, bool m TPropertyDescAndValueList theAttributeList; + if (masterSlide) + inElementData.m_Element->m_OnMaster = true; + const char8_t *theRef = ""; inReader.Att("ref", theRef); if (theRef && *theRef && theRef[0] == '#') |