summaryrefslogtreecommitdiffstats
path: root/src/Authoring/Studio/Palettes
diff options
context:
space:
mode:
authorKaj Grönholm <kaj.gronholm@qt.io>2018-11-15 11:50:48 +0200
committerKaj Grönholm <kaj.gronholm@qt.io>2019-03-11 09:25:33 +0000
commit52730ddc3a94acc32cd2b28fc49b45dd5f19e3c5 (patch)
tree68ac61ab131fd400c30361871a2b507de6cd3681 /src/Authoring/Studio/Palettes
parent4fe82709aceceae1037c870d460acb73b05f5d6a (diff)
Allow grouping of single objects
Adjust logic to match this behavior. Task-number: QT3DS-2673 Change-Id: Ib3519e1abc10086469de767c3427f3864609fb5b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Authoring/Studio/Palettes')
-rw-r--r--src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/RowTreeContextMenu.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/RowTreeContextMenu.cpp b/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/RowTreeContextMenu.cpp
index 5daa7b63..e7d2898d 100644
--- a/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/RowTreeContextMenu.cpp
+++ b/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/RowTreeContextMenu.cpp
@@ -322,10 +322,10 @@ void RowTreeContextMenu::deleteObject()
void RowTreeContextMenu::groupObjects()
{
- if (m_canGroupObjects)
- m_TimelineItemBinding->PerformTransaction(ITimelineItemBinding::EUserTransaction_Group);
- else if (m_canUngroupObjects)
+ if (m_canUngroupObjects)
m_TimelineItemBinding->PerformTransaction(ITimelineItemBinding::EUserTransaction_Ungroup);
+ else if (m_canGroupObjects)
+ m_TimelineItemBinding->PerformTransaction(ITimelineItemBinding::EUserTransaction_Group);
}
bool RowTreeContextMenu::canInspectComponent() const