wubba lubba dub dub

PixiEditor/Models/Layers/LayerStructure.cs

@@ -88,24 +88,44 @@ namespace PixiEditor.Models.Layers
             {
                 if (layer == topmostLayer) continue;
                 var layerGroup = GetGroupByLayer(layer.LayerGuid);
-                if (layerGroup == group.Parent)
-                {
-                    Owner.MoveLayerInStructure(layer.LayerGuid, lastLayer);
-                    AssignParent(layer.LayerGuid, group);
-                }
-                else if(layerGroup.Parent == group.Parent)
+
+                if (layerGroup != group.Parent)
                 {
-                    AssignParent(layer.LayerGuid, group);
-                    layerGroup.Parent = group;
-                    group.Subgroups.Add(layerGroup);
+                    GuidStructureItem sameLevelGroupParent = GetLevelGroup(layerGroup, group.Parent);
+                    if (GetGroupLayers(sameLevelGroupParent).TrueForAll(x => x.IsActive))
+                    {
+                        Owner.MoveGroupInStructure(sameLevelGroupParent.GroupGuid, lastLayer);
+                        lastLayer = sameLevelGroupParent.EndLayerGuid; // Todo: Shift click on group, select other layers in between
+                        continue;
+                    }
                 }
 
+                Owner.MoveLayerInStructure(layer.LayerGuid, lastLayer);
+                AssignParent(layer.LayerGuid, group);
+
                 lastLayer = layer.LayerGuid;
             }
 
             return group;
         }
 
+        private GuidStructureItem GetLevelGroup(GuidStructureItem group, GuidStructureItem levelGroup)
+        {
+            GuidStructureItem currentGroup = group;
+
+            while(currentGroup != null && currentGroup.Parent != null)
+            {
+                if(currentGroup == null)
+                {
+                    return null;
+                }
+
+                currentGroup = group.Parent;
+            }
+
+            return currentGroup;
+        }
+
         /// <summary>
         /// Finds layer which is topmost in layer tree.
         /// </summary>