Avoid missing line under toolbar when GPS toolbar is docked

qgis · Jan 11, 2023 · a30bf17 · a30bf17
1 parent 31dda41
commit a30bf17
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/src/app/gps/qgsgpstoolbar.cpp b/src/app/gps/qgsgpstoolbar.cpp
@@ -178,8 +178,7 @@ QgsGpsToolBar::QgsGpsToolBar( QgsAppGpsConnection *connection, QgsMapCanvas *can
         mAddTrackVertexAction->setEnabled( mEnableAddVertexButton );
         break;
     }
-    // this is necessary to ensure that the toolbar in floating mode correctly resizes to fit the label!
-    setFixedWidth( sizeHint().width() );
+    adjustSize();
   } );
 
   connect( QgsProject::instance()->gpsSettings(), &QgsProjectGpsSettings::destinationLayerChanged,
@@ -188,8 +187,7 @@ QgsGpsToolBar::QgsGpsToolBar( QgsAppGpsConnection *connection, QgsMapCanvas *can
   connect( QgsProject::instance()->gpsSettings(), &QgsProjectGpsSettings::automaticallyAddTrackVerticesChanged, this, [ = ]( bool enabled ) { setAddVertexButtonEnabled( !enabled ); } );
   setAddVertexButtonEnabled( !QgsProject::instance()->gpsSettings()->automaticallyAddTrackVertices() );
 
-  // this is necessary to ensure that the toolbar in floating mode correctly resizes to fit the label!
-  setFixedWidth( sizeHint().width() );
+  adjustSize();
 }
 
 void QgsGpsToolBar::setGpsDigitizing( QgsAppGpsDigitizing *digitizing )
@@ -305,8 +303,7 @@ void QgsGpsToolBar::updateLocationLabel()
     mInformationButton->setText( parts.join( ' ' ) );
   }
 
-  // this is necessary to ensure that the toolbar in floating mode correctly resizes to fit the label!
-  setFixedWidth( sizeHint().width() );
+  adjustSize();
 }
 
 void QgsGpsToolBar::destinationLayerChanged( QgsVectorLayer *vlayer )
@@ -475,3 +472,12 @@ void QgsGpsToolBar::createLocationWidget()
   insertWidget( mSettingsMenuAction, mInformationButton );
 }
 
+void QgsGpsToolBar::adjustSize()
+{
+  // this is necessary to ensure that the toolbar in floating mode correctly resizes to fit the label!
+  if ( isFloating() )
+    setFixedWidth( sizeHint().width() );
+  else
+    setFixedWidth( QWIDGETSIZE_MAX );
+}
+
diff --git a/src/app/gps/qgsgpstoolbar.h b/src/app/gps/qgsgpstoolbar.h
@@ -65,6 +65,7 @@ class QgsGpsToolBar : public QToolBar
   private:
 
     void createLocationWidget();
+    void adjustSize();
 
     QgsAppGpsConnection *mConnection = nullptr;
     QgsMapCanvas *mCanvas = nullptr;