fix customization for dock and toolbar

qgis · Sep 24, 2021 · 968964a · 968964a
1 parent b40c53c
commit 968964a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -1616,7 +1616,7 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh
 
   // do main window customization - after window state has been restored, before the window is shown
   startProfile( tr( "Update customization on main window" ) );
-  QgsCustomization::instance()->updateMainWindow( mToolbarMenu );
+  QgsCustomization::instance()->updateMainWindow( mToolbarMenu, mPanelMenu );
   endProfile();
 
   mSplash->showMessage( tr( "Populate saved styles" ), Qt::AlignHCenter | Qt::AlignBottom, splashTextColor );

diff --git a/src/app/qgscustomization.cpp b/src/app/qgscustomization.cpp
@@ -774,7 +774,7 @@ QgsCustomization::QgsCustomization()
   mEnabled = settings.value( QStringLiteral( "UI/Customization/enabled" ), "false" ).toString() == QLatin1String( "true" );
 }
 
-void QgsCustomization::updateMainWindow( QMenu *toolBarMenu )
+void QgsCustomization::updateMainWindow( QMenu *toolBarMenu, QMenu *panelMenu )
 {
   // collect tree items even if the customization is disabled
   createTreeItemMenus();
@@ -823,6 +823,7 @@ void QgsCustomization::updateMainWindow( QMenu *toolBarMenu )
       if ( !visible )
       {
         mw->removeToolBar( tb );
+        tb->setParent( NULL );
         // remove also from menu, because toolbars removed here, switched on later from menu don't work correctly
         toolBarMenu->removeAction( tb->toggleViewAction() );
       }
@@ -880,6 +881,8 @@ void QgsCustomization::updateMainWindow( QMenu *toolBarMenu )
       if ( !visible )
       {
         mw->removeDockWidget( dw );
+        dw->setParent( NULL );
+        panelMenu->removeAction( dw->toggleViewAction() );
       }
     }
   }

diff --git a/src/app/qgscustomization.h b/src/app/qgscustomization.h
@@ -132,7 +132,7 @@ class APP_EXPORT QgsCustomization : public QObject
     static void removeFromLayout( QLayout *layout, QWidget *widget );
 
     void updateBrowserWidget( QgsBrowserDockWidget *model );
-    void updateMainWindow( QMenu *toolBarMenu );
+    void updateMainWindow( QMenu *toolBarMenu, QMenu *panelMenu );
 
     // make sure to enable/disable before creating QgisApp in order to get it customized (or not)
     void setEnabled( bool enabled ) { mEnabled = enabled; }