add tooltip and raise dialog when undock toggled

qgis · Jan 14, 2022 · 74ac392 · 74ac392
1 parent becd7ed
commit 74ac392
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git a/src/app/3d/qgs3dmapcanvaswidget.cpp b/src/app/3d/qgs3dmapcanvaswidget.cpp
@@ -137,6 +137,7 @@ Qgs3DMapCanvasWidget::Qgs3DMapCanvasWidget( QWidget *parent )
 
   mDockUnDockBtn = new QToolButton;
   mDockUnDockBtn->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "mDockify.svg" ) ) );
+  mDockUnDockBtn->setToolTip( QStringLiteral( "Dock 3D Map View" ) );
   mDockUnDockBtn->setCheckable( true );
   mDockUnDockBtn->setChecked( true );
   mDockUnDockBtn->setEnabled( true );

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -9958,6 +9958,10 @@ QgsDockableWidget *QgisApp::duplicate3DMapView( const QString &existingViewName,
       map->setTransformContext( QgsProject::instance()->transformContext() );
     } );
 
+    if ( QgsDockWidget *dw = mapCanvasDock3D->dockWidget() )
+    {
+      setupDockWidget( dw, true );
+    }
   }
   else
   {
@@ -9966,11 +9970,6 @@ QgsDockableWidget *QgisApp::duplicate3DMapView( const QString &existingViewName,
     read3DMapViewSettings( mapCanvasDock3D, elem );
   }
 
-  if ( QgsDockWidget *dw = mapCanvasDock3D->dockWidget() )
-  {
-    setupDockWidget( dw, true );
-  }
-
   QDomElement elem3DMap;
   elem3DMap = doc.createElement( QStringLiteral( "view" ) );
   write3DMapViewSettings( mapCanvasDock3D, doc, elem3DMap );
@@ -16788,13 +16787,7 @@ void QgisApp::read3DMapViewSettings( QgsDockableWidget *w, QDomElement &elem3DMa
     widget->animationWidget()->setAnimation( animationSettings );
   }
 
-  if ( QgsDockWidget *dw = w->dockWidget() )
-  {
-    readDockWidgetSettings( dw, elem3DMap );
-  }
-
-  QDialog *d = w->dialog();
-  if ( d )
+  if ( QDialog *d = w->dialog() )
   {
     int dx = elem3DMap.attribute( QStringLiteral( "d_x" ), "0" ).toInt();
     int dy = elem3DMap.attribute( QStringLiteral( "d_x" ), "0" ).toInt();
@@ -16805,6 +16798,11 @@ void QgisApp::read3DMapViewSettings( QgsDockableWidget *w, QDomElement &elem3DMa
 
   bool isDocked = elem3DMap.attribute( QStringLiteral( "isDocked" ), "1" ).toInt() == 1;
   dynamic_cast< Qgs3DMapCanvasWidget * >( w->widget() )->setDocked( isDocked );
+
+  if ( QgsDockWidget *dw = w->dockWidget() )
+  {
+    readDockWidgetSettings( dw, elem3DMap );
+  }
 }
 #endif
 

diff --git a/src/app/qgsdockablewidget.cpp b/src/app/qgsdockablewidget.cpp
@@ -81,7 +81,6 @@ void QgsDockableWidget::toggleDockMode( bool docked )
     // TODO: apply resizing in a better way
     mDock->resize( mDock->size() + QSize( 1, 1 ) );
     mDock->resize( mDock->size() - QSize( 1, 1 ) );
-
   }
   else
   {
@@ -91,13 +90,13 @@ void QgsDockableWidget::toggleDockMode( bool docked )
     mDialog->layout()->addWidget( mWidget );
     mDock->setWidget( nullptr );
 
+    mDialog->raise();
     mDialog->show();
     mDock->setVisible( false );
 
     // TODO: apply resizing in a better way
     mDialog->resize( mDialog->size() + QSize( 1, 1 ) );
     mDialog->resize( mDialog->size() - QSize( 1, 1 ) );
-
   }
 }