fix renaming 3D view

qgis · Jan 17, 2022 · fccfeff · fccfeff
1 parent 9f2a9bc
commit fccfeff
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git a/src/app/3d/qgs3dmapcanvaswidget.cpp b/src/app/3d/qgs3dmapcanvaswidget.cpp
@@ -57,8 +57,6 @@ Qgs3DMapCanvasWidget::Qgs3DMapCanvasWidget( bool isDocked )
   : QWidget( nullptr )
 {
   const QgsSettings setting;
-  setAttribute( Qt::WA_DeleteOnClose );  // removes the dock widget from main window when
-
 
   QToolBar *toolBar = new QToolBar( this );
   toolBar->setIconSize( QgisApp::instance()->iconSize( true ) );
@@ -295,6 +293,12 @@ void Qgs3DMapCanvasWidget::setDocked( bool docked )
   mDockUnDockBtn->setChecked( docked );
 }
 
+void Qgs3DMapCanvasWidget::setWindowTitle( const QString &title )
+{
+  QWidget::setWindowTitle( title );
+  mDockableWidget->setWindowTitle( title );
+}
+
 void Qgs3DMapCanvasWidget::toggleNavigationWidget( bool visibility )
 {
   mCanvas->setOnScreenNavigationVisibility( visibility );

diff --git a/src/app/3d/qgs3dmapcanvaswidget.h b/src/app/3d/qgs3dmapcanvaswidget.h
@@ -56,6 +56,8 @@ class APP_EXPORT Qgs3DMapCanvasWidget : public QWidget
 
     void setDocked( bool docked );
 
+    void setWindowTitle( const QString &title );
+
   signals:
     void toggleDockModeRequested( bool docked );
 

diff --git a/src/app/3d/qgs3dviewsmanagerdialog.cpp b/src/app/3d/qgs3dviewsmanagerdialog.cpp
@@ -64,8 +64,7 @@ void Qgs3DViewsManagerDialog::showClicked()
 
   QString viewName = m3DViewsListView->selectionModel()->selectedRows().at( 0 ).data( Qt::DisplayRole ).toString();
 
-  Qgs3DMapCanvasWidget *widget = QgisApp::instance()->open3DMapView( viewName );
-  widget->dockableWidget()->show();
+  QgisApp::instance()->open3DMapView( viewName );
 
   m3DViewsListView->selectionModel()->setCurrentIndex( m3DViewsListView->selectionModel()->currentIndex(), QItemSelectionModel::Select );
   currentChanged( m3DViewsListView->selectionModel()->currentIndex(), m3DViewsListView->selectionModel()->currentIndex() );

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -14002,10 +14002,9 @@ Qgs3DMapCanvasWidget *QgisApp::createNew3DMapCanvasDock( const QString &name, bo
   markDirty();
 
   Qgs3DMapCanvasWidget *widget = new Qgs3DMapCanvasWidget( isDocked );
-  QgsDockableWidgetHelper *dockableWidget = widget->dockableWidget();
 
   mOpen3DMapViews.insert( widget );
-  dockableWidget->setWindowTitle( name );
+  widget->setWindowTitle( name );
   widget->mapCanvas3D()->setObjectName( name );
   widget->setMainCanvas( mMapCanvas );
   widget->mapCanvas3D()->setTemporalController( mTemporalControllerWidget->temporalController() );

diff --git a/src/app/qgsdockablewidgethelper.cpp b/src/app/qgsdockablewidgethelper.cpp
@@ -102,11 +102,11 @@ void QgsDockableWidgetHelper::toggleDockMode( bool docked )
     mDialog = nullptr;
   }
 
+  mIsDocked = docked;
+
   if ( docked )
   {
     // going from window -> dock
-    mIsDocked = true;
-
     mDock = new QgsDockWidget( QgisApp::instance() );
     mDock->setWindowTitle( this->windowTitle() );
     mDock->setWidget( mWidget );
@@ -123,9 +123,7 @@ void QgsDockableWidgetHelper::toggleDockMode( bool docked )
   else
   {
     // going from dock -> window
-    mIsDocked = false;
-
-    mDialog = new QDialog( this, Qt::Window );
+    mDialog = new QDialog( QgisApp::instance(), Qt::Window );
 
     mDialog->setWindowTitle( this->windowTitle() );
     QVBoxLayout *vl = new QVBoxLayout();
@@ -148,7 +146,6 @@ void QgsDockableWidgetHelper::toggleDockMode( bool docked )
 void QgsDockableWidgetHelper::setWindowTitle( const QString &title )
 {
   QWidget::setWindowTitle( title );
-  mWidget->setWindowTitle( title );
   if ( mDialog )
   {
     mDialog->setWindowTitle( title );