Fixes #52740 : remove properties widget when layout item is destroyed

troopa81 · github-actions[bot] · commit 00eaa2dedaf4 · 2023-10-18T06:53:01.000Z
diff --git a/src/app/layout/qgslayoutdesignerdialog.cpp b/src/app/layout/qgslayoutdesignerdialog.cpp
@@ -1320,7 +1320,8 @@ void QgsLayoutDesignerDialog::showItemOptions( QgsLayoutItem *item, bool bringPa
 
   if ( auto widget = qobject_cast< QgsLayoutItemBaseWidget * >( mItemPropertiesStack->mainPanel() ) )
   {
-    if ( widget->layoutObject() == item )
+    const QgsLayoutObject *currentItem = widget->layoutObject();
+    if ( currentItem == item )
     {
       // already showing properties for this item - we don't want to create a new panel
       if ( bringPanelToFront )
@@ -1336,6 +1337,9 @@ void QgsLayoutDesignerDialog::showItemOptions( QgsLayoutItem *item, bool bringPa
         if ( bringPanelToFront )
           mItemDock->setUserVisible( true );
 
+        disconnect( currentItem, &QgsLayoutItem::destroyed, this, &QgsLayoutDesignerDialog::onItemDestroyed );
+        connect( item, &QgsLayoutItem::destroyed, this, &QgsLayoutDesignerDialog::onItemDestroyed );
+
         return;
       }
     }
@@ -1355,10 +1359,7 @@ void QgsLayoutDesignerDialog::showItemOptions( QgsLayoutItem *item, bool bringPa
     connect( ppWidget, &QgsLayoutPagePropertiesWidget::pageOrientationChanged, this, &QgsLayoutDesignerDialog::pageOrientationChanged );
 
   widget->setDockMode( true );
-  connect( item, &QgsLayoutItem::destroyed, widget.get(), [this]
-  {
-    delete mItemPropertiesStack->takeMainPanel();
-  } );
+  connect( item, &QgsLayoutItem::destroyed, this, &QgsLayoutDesignerDialog::onItemDestroyed );
 
   mItemPropertiesStack->setMainPanel( widget.release() );
   if ( bringPanelToFront )
@@ -5035,3 +5036,12 @@ void QgsLayoutDesignerDialog::toolButtonActionTriggered( QAction *action )
 
   bt->setDefaultAction( action );
 }
+
+void QgsLayoutDesignerDialog::onItemDestroyed( QObject *item )
+{
+  if ( QgsLayoutItemBaseWidget *widget = qobject_cast< QgsLayoutItemBaseWidget * >( mItemPropertiesStack->mainPanel() ) )
+  {
+    if ( widget->layoutObject() == item )
+      delete mItemPropertiesStack->takeMainPanel();
+  }
+}
diff --git a/src/app/layout/qgslayoutdesignerdialog.h b/src/app/layout/qgslayoutdesignerdialog.h
@@ -416,6 +416,7 @@ class QgsLayoutDesignerDialog: public QMainWindow, public Ui::QgsLayoutDesignerB
     void backgroundTaskCountChanged( int total );
     void onMapPreviewRefreshed();
     void onItemAdded( QgsLayoutItem *item );
+    void onItemDestroyed( QObject *item );
 
   private:
 
@@ -587,4 +588,3 @@ class QgsLayoutDesignerDialog: public QMainWindow, public Ui::QgsLayoutDesignerB
 };
 
 #endif // QGSLAYOUTDESIGNERDIALOG_H
-
