diff options
| author | Kaj Grönholm <kaj.gronholm@qt.io> | 2018-11-15 11:50:48 +0200 |
|---|---|---|
| committer | Kaj Grönholm <kaj.gronholm@qt.io> | 2019-03-11 09:25:33 +0000 |
| commit | 52730ddc3a94acc32cd2b28fc49b45dd5f19e3c5 (patch) | |
| tree | 68ac61ab131fd400c30361871a2b507de6cd3681 | |
| parent | 4fe82709aceceae1037c870d460acb73b05f5d6a (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>
| -rw-r--r-- | src/Authoring/Studio/Application/StudioApp.cpp | 4 | ||||
| -rw-r--r-- | src/Authoring/Studio/MainFrm.cpp | 4 | ||||
| -rw-r--r-- | src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/RowTreeContextMenu.cpp | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/Authoring/Studio/Application/StudioApp.cpp b/src/Authoring/Studio/Application/StudioApp.cpp index 44127bdc..1bd847e7 100644 --- a/src/Authoring/Studio/Application/StudioApp.cpp +++ b/src/Authoring/Studio/Application/StudioApp.cpp @@ -1042,10 +1042,10 @@ QString CStudioApp::getDeleteType() const bool CStudioApp::canGroupSelectedObjects() const { - // Grouping is never just one row, we always deal with multiple selected items + // Grouping is allowed for single and for multiple selected items. qt3dsdm::TInstanceHandleList selected = m_core->GetDoc() ->GetSelectedValue().GetSelectedInstances(); - return (selected.size() > 1); + return (selected.size() >= 1); } bool CStudioApp::canUngroupSelectedObjects() const diff --git a/src/Authoring/Studio/MainFrm.cpp b/src/Authoring/Studio/MainFrm.cpp index dcabd529..0acd00e8 100644 --- a/src/Authoring/Studio/MainFrm.cpp +++ b/src/Authoring/Studio/MainFrm.cpp @@ -727,8 +727,8 @@ void CMainFrame::onEditDelete() void CMainFrame::onEditGroup() { - if (!g_StudioApp.groupSelectedObjects()) - g_StudioApp.ungroupSelectedObjects(); + if (!g_StudioApp.ungroupSelectedObjects()) + g_StudioApp.groupSelectedObjects(); } /** 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 |