diff options
| author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2019-03-26 13:21:30 +0200 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@qt.io> | 2019-03-26 11:43:41 +0000 |
| commit | 671c2d3dd9b31cc3e62346857f5c22709a5c2fba (patch) | |
| tree | 634539b97352357ad214541077616e312be4cdb6 /src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.h | |
| parent | 6297443c8cdba4cd82d1f74ef89ab99aaf78a98f (diff) | |
Fix master slide item grouping issuesv2.3.0-rc2
Disallow grouping mixed non-master and master items.
If master items are grouped, the resulting group is a master group.
Disallow dragging master items under non-master items in some
edge cases that still allowed it.
Change-Id: Id4e18405526fb5b0f9ed17bc29e758101a19875e
Fixes: QT3DS-3224
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.h')
| -rw-r--r-- | src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.h b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.h index 5ababf96..f8b5f0de 100644 --- a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.h +++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.h @@ -183,6 +183,9 @@ public: ITimelineItemProperty *GetOrCreatePropertyBinding(qt3dsdm::Qt3DSDMPropertyHandle inPropertyHandle); ITimelineItemProperty *GetPropertyBinding(qt3dsdm::Qt3DSDMPropertyHandle inPropertyHandle); + + bool isRootComponent() const; + protected: virtual ITimelineTimebar *CreateTimelineTimebar(); void RemoveAllPropertyBindings(); |