Reassign children from child layout to parent layout

limereport/items/lrabstractlayout.cpp

@@ -57,22 +57,7 @@ void AbstractLayout::addChild(BaseDesignIntf* item, bool updateSize)
     item->setFixedPos(true);
     item->setPossibleResizeDirectionFlags(ResizeRight | ResizeBottom);
 
-    connect(
+    connectTolayout(item);
-        item, SIGNAL(destroyed(QObject*)),
-        this, SLOT(slotOnChildDestroy(QObject*))
-    );
-    connect(
-        item,SIGNAL(geometryChanged(QObject*,QRectF,QRectF)),
-        this,SLOT(slotOnChildGeometryChanged(QObject*,QRectF,QRectF))
-    );
-    connect(
-        item, SIGNAL(itemVisibleHasChanged(BaseDesignIntf*)),
-        this, SLOT(slotOnChildVisibleHasChanged(BaseDesignIntf*))
-    );
-    connect(
-        item, SIGNAL(itemSelectedHasBeenChanged(BaseDesignIntf*,bool)),
-        this, SLOT(slotOnChildSelectionHasChanged(BaseDesignIntf*,bool))
-    );
 
     if (updateSize){
         relocateChildren();
@@ -267,6 +252,26 @@ void AbstractLayout::rebuildChildrenIfNeeded(){
     }
 }
 
+void AbstractLayout::connectTolayout(BaseDesignIntf *item)
+{
+    connect(
+        item, SIGNAL(destroyed(QObject*)),
+        this, SLOT(slotOnChildDestroy(QObject*))
+        );
+    connect(
+        item,SIGNAL(geometryChanged(QObject*,QRectF,QRectF)),
+        this,SLOT(slotOnChildGeometryChanged(QObject*,QRectF,QRectF))
+        );
+    connect(
+        item, SIGNAL(itemVisibleHasChanged(BaseDesignIntf*)),
+        this, SLOT(slotOnChildVisibleHasChanged(BaseDesignIntf*))
+        );
+    connect(
+        item, SIGNAL(itemSelectedHasBeenChanged(BaseDesignIntf*,bool)),
+        this, SLOT(slotOnChildSelectionHasChanged(BaseDesignIntf*,bool))
+        );
+}
+
 BaseDesignIntf *AbstractLayout::findNext(BaseDesignIntf *item)
 {
     rebuildChildrenIfNeeded();

limereport/items/lrabstractlayout.h

@@ -52,6 +52,7 @@ protected:
     QVariant itemChange(GraphicsItemChange change, const QVariant &value);
     void updateItemSize(DataSourceManager* dataManager, RenderPass pass, int maxHeight);
     void rebuildChildrenIfNeeded();
+    void connectTolayout(BaseDesignIntf* item);
 private:
     virtual void sortChildren() = 0;
     virtual void divideSpace() = 0;

limereport/items/lrhorizontallayout.cpp

@@ -171,9 +171,14 @@ void HorizontalLayout::updateLayoutSize()
 void HorizontalLayout::relocateChildren()
 {
     int spaceBorder = (borderLines() != 0) ? borderLineSize() : 0;
+    QList<BaseDesignIntf*> newChildren;
     if (layoutsChildren().count() < childItems().size()-1){
+        auto oldChildren = layoutsChildren();
         layoutsChildren().clear();
         foreach (BaseDesignIntf* item, childBaseItems()) {
+            if (!oldChildren.contains(item)) {
+                newChildren.append(item);
+            }
             layoutsChildren().append(item);
         }
     }
@@ -188,6 +193,10 @@ void HorizontalLayout::relocateChildren()
         }
     }
     setIsRelocating(false);
+
+    for (BaseDesignIntf* item : newChildren) {
+        connectTolayout(item);
+    }
 }
 
 void HorizontalLayout::divideSpace(){

limereport/items/lrverticallayout.cpp

@@ -57,9 +57,14 @@ void VerticalLayout::updateLayoutSize()
 void VerticalLayout::relocateChildren()
 {
     int spaceBorder = (borderLines() != 0) ? borderLineSize() : 0;
+    QList<BaseDesignIntf*> newChildren;
     if (layoutsChildren().count() < childItems().size() - 1){
+        auto oldChildren = layoutsChildren();
         layoutsChildren().clear();
         foreach (BaseDesignIntf* item, childBaseItems()) {
+            if (!oldChildren.contains(item)) {
+                newChildren.append(item);
+            }
             layoutsChildren().append(item);
         }
     }
@@ -74,6 +79,10 @@ void VerticalLayout::relocateChildren()
         }
     }
     setIsRelocating(false);
+
+    for (BaseDesignIntf* item : newChildren) {
+        connectTolayout(item);
+    }
 }
 
 bool VerticalLayout::canBeSplitted(int height) const

limereport/lrpagedesignintf.cpp

@@ -554,17 +554,16 @@ CommandIf::Ptr PageDesignIntf::removeReportItemCommand(BaseDesignIntf *item){
         CommandIf::Ptr command = createBandDeleteCommand(this,band);
         return command;
     } else {
-        LayoutDesignIntf* layout = dynamic_cast<LayoutDesignIntf*>(item->parent());
+        LayoutDesignIntf* parentLayout = dynamic_cast<LayoutDesignIntf*>(item->parent());
-        if (layout && (layout->childrenCount()==2)){
+        LayoutDesignIntf* layout = dynamic_cast<LayoutDesignIntf*>(item);
+        // When removing layout child all his children will be assigned to parent
+        if (!layout && parentLayout && (parentLayout->childrenCount() == 2)) {
             CommandGroup::Ptr commandGroup = CommandGroup::create();
-            commandGroup->addCommand(DeleteLayoutCommand::create(this, layout),false);
+            commandGroup->addCommand(DeleteLayoutCommand::create(this, parentLayout),false);
             commandGroup->addCommand(DeleteItemCommand::create(this,item),false);
             return commandGroup;
         } else {
-            CommandIf::Ptr command = (dynamic_cast<LayoutDesignIntf*>(item))?
+            return layout ? DeleteLayoutCommand::create(this, layout) : DeleteItemCommand::create(this, item) ;
-                        DeleteLayoutCommand::create(this, dynamic_cast<LayoutDesignIntf*>(item)) :
-                        DeleteItemCommand::create(this, item) ;
-            return command;
         }
     }
 }