Make grouping work correctly with multiselected parents and children

Change-Id: Ie0a933d4ab2adf699ea2b343aa744e1b6d7a677c
Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>

2 files changed, 16 insertions, 5 deletions

diff --git a/editorlib/qml/ComponentMenu.qml b/editorlib/qml/ComponentMenu.qml
index 8a9f759..5a993ab 100644
--- a/editorlib/qml/ComponentMenu.qml
+++ b/editorlib/qml/ComponentMenu.qml
@@ -168,15 +168,26 @@ Menu {
     }
     MenuItem {
         text: qsTr("Group Selected") + editorScene.emptyString
-        enabled: multiSelect && !multiSelectedCamera
+        enabled: !entityTreeView.sceneRootSelected
         iconSource: "images/group.png"
         onTriggered: {
             editorScene.undoHandler.beginMacro(text)
-            var reparentList = selectionList // Copy list, as the original is emptied on insertEntity
+            // Copy list, as the original is emptied on insertEntity
+            var reparentList = []
+            var groupCenter
+            if (entityTree.multiSelect) {
+                reparentList = editorScene.sceneModel.parentList(selectionList)
+                groupCenter = editorScene.getMultiSelectionCenter()
+            } else {
+                reparentList[0] = selectedEntityName
+                groupCenter = selectedEntity.selectionBoxCenter()
+            }
+
             // TODO: Allow creating groups under other entities?
 
-            // Center the new group on the grouped items
-            var groupCenter = editorScene.getMultiSelectionCenter()
+            // Select scene root before doing reparenting to avoid having selection changes
+            // while removing, as indexes can be corrupt during the removal
+            entityTree.selectSceneRoot()
 
             // Add new group
             editorScene.undoHandler.createInsertEntityCommand(1, editorScene.sceneRootName(),
diff --git a/editorlib/src/editorsceneitem.h b/editorlib/src/editorsceneitem.h
index 9337c14..ecb9d17 100644
--- a/editorlib/src/editorsceneitem.h
+++ b/editorlib/src/editorsceneitem.h
@@ -97,7 +97,7 @@ public:
     Qt3DCore::QTransform *entityTransform() const { return m_entityTransform; }
     QVector3D selectionBoxExtents() const { return m_selectionBoxExtents; }
     QVector3D entityMeshExtents() const { return m_entityMeshExtents; }
-    QVector3D selectionBoxCenter() const { return m_selectionBoxCenter; }
+    Q_INVOKABLE QVector3D selectionBoxCenter() const { return m_selectionBoxCenter; }
     QVector3D entityMeshCenter() const { return m_entityMeshCenter; }
 
     bool canRotate() const { return m_canRotate; }