Prevent status bar coordinate widget from shrinking too small

nyalldawson · nyalldawson · commit 0823de0fab8a · 2018-03-02T16:09:42.000+11:00
diff --git a/src/app/qgsstatusbarcoordinateswidget.cpp b/src/app/qgsstatusbarcoordinateswidget.cpp
@@ -35,6 +35,7 @@ QgsStatusBarCoordinatesWidget::QgsStatusBarCoordinatesWidget( QWidget *parent )
 {
   // calculate the size of two chars
   mTwoCharSize = fontMetrics().width( QStringLiteral( "OO" ) );
+  mMinimumWidth = mTwoCharSize * 4;
 
   // add a label to show current position
   mLabel = new QLabel( QString(), this );
@@ -251,7 +252,7 @@ void QgsStatusBarCoordinatesWidget::ensureCoordinatesVisible()
 {
 
   //ensure the label is big (and small) enough
-  int width = mLineEdit->fontMetrics().width( mLineEdit->text() ) + 10;
+  int width = std::max( mLineEdit->fontMetrics().width( mLineEdit->text() ) + 10, mMinimumWidth );
   if ( mLineEdit->minimumWidth() < width || ( mLineEdit->minimumWidth() - width ) > mTwoCharSize )
   {
     mLineEdit->setMinimumWidth( width );
diff --git a/src/app/qgsstatusbarcoordinateswidget.h b/src/app/qgsstatusbarcoordinateswidget.h
@@ -72,7 +72,8 @@ class APP_EXPORT QgsStatusBarCoordinatesWidget : public QWidget
     QValidator *mCoordsEditValidator = nullptr;
     QTimer *mDizzyTimer = nullptr;
     QgsMapCanvas *mMapCanvas = nullptr;
-    int mTwoCharSize;
+    int mTwoCharSize = 0;
+    int mMinimumWidth = 0;
 
     //! The number of decimal places to use if not automatic
     unsigned int mMousePrecisionDecimalPlaces;

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@ QgsStatusBarCoordinatesWidget::QgsStatusBarCoordinatesWidget( QWidget *parent )`
`35`	`35`	`{`
`36`	`36`	`// calculate the size of two chars`
`37`	`37`	`mTwoCharSize = fontMetrics().width( QStringLiteral( "OO" ) );`
	`38`	`+ mMinimumWidth = mTwoCharSize * 4;`
`38`	`39`
`39`	`40`	`// add a label to show current position`
`40`	`41`	`mLabel = new QLabel( QString(), this );`
`@@ -251,7 +252,7 @@ void QgsStatusBarCoordinatesWidget::ensureCoordinatesVisible()`
`251`	`252`	`{`
`252`	`253`
`253`	`254`	`//ensure the label is big (and small) enough`
`254`		`- int width = mLineEdit->fontMetrics().width( mLineEdit->text() ) + 10;`
	`255`	`+ int width = std::max( mLineEdit->fontMetrics().width( mLineEdit->text() ) + 10, mMinimumWidth );`
`255`	`256`	`if ( mLineEdit->minimumWidth() < width \|\| ( mLineEdit->minimumWidth() - width ) > mTwoCharSize )`
`256`	`257`	`{`
`257`	`258`	`mLineEdit->setMinimumWidth( width );`