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.cpp | |
| 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.cpp')
| -rw-r--r-- | src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp index 47df8a27..0297e17e 100644 --- a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp +++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp @@ -857,6 +857,12 @@ Qt3DSDMTimelineItemBinding::GetPropertyBinding(Qt3DSDMPropertyHandle inPropertyH return nullptr; } +bool Qt3DSDMTimelineItemBinding::isRootComponent() const +{ + auto bridge = g_StudioApp.GetCore()->GetDoc()->GetStudioSystem()->GetClientDataModelBridge(); + return bridge->IsActiveComponent(m_DataHandle); +} + ITimelineItemProperty * Qt3DSDMTimelineItemBinding::GetOrCreatePropertyBinding(Qt3DSDMPropertyHandle inPropertyHandle) { |