Fix some button sizes on hidpi displays

nyalldawson · nyalldawson · commit eb8f91a55677 · 2017-07-07T18:17:40.000+10:00
diff --git a/python/gui/qgscolorbutton.sip b/python/gui/qgscolorbutton.sip
@@ -44,7 +44,7 @@ class QgsColorButton : QToolButton
  the button will use the global color scheme registry instead
 %End
 
-    virtual QSize sizeHint() const;
+    virtual QSize minimumSizeHint() const;
 
     QColor color() const;
 %Docstring
diff --git a/src/gui/qgscolorbutton.cpp b/src/gui/qgscolorbutton.cpp
@@ -68,14 +68,17 @@ QgsColorButton::QgsColorButton( QWidget *parent, const QString &cdt, QgsColorSch
   setPopupMode( QToolButton::MenuButtonPopup );
 }
 
-QSize QgsColorButton::sizeHint() const
+QSize QgsColorButton::minimumSizeHint() const
 {
   //make sure height of button looks good under different platforms
+  QSize size;
 #ifdef Q_OS_WIN
-  return QSize( 120, 22 );
+  size = QSize( 120, 22 );
 #else
-  return QSize( 120, 28 );
+  size = QSize( 120, 28 );
 #endif
+  int textHeight = fontMetrics().height() * 1.1;
+  return QSize( size.width(), qMax( size.height(), textHeight ) );
 }
 
 const QPixmap &QgsColorButton::transparentBackground()
diff --git a/src/gui/qgscolorbutton.h b/src/gui/qgscolorbutton.h
@@ -76,7 +76,7 @@ class GUI_EXPORT QgsColorButton : public QToolButton
      */
     QgsColorButton( QWidget *parent SIP_TRANSFERTHIS = nullptr, const QString &cdt = "", QgsColorSchemeRegistry *registry = nullptr );
 
-    virtual QSize sizeHint() const override;
+    virtual QSize minimumSizeHint() const override;
 
     /** Return the currently selected color.
      * \returns currently selected color
diff --git a/src/gui/qgsfontbutton.cpp b/src/gui/qgsfontbutton.cpp
@@ -51,11 +51,9 @@ QgsFontButton::QgsFontButton( QWidget *parent, const QString &dialogTitle )
 QSize QgsFontButton::minimumSizeHint() const
 {
   //make sure height of button looks good under different platforms
-#ifdef Q_OS_WIN
-  return QToolButton::minimumSizeHint();
-#else
-  return QSize( 120, 28 );
-#endif
+  QSize size = QToolButton::minimumSizeHint();
+  int fontHeight = fontMetrics().height() * 1.4;
+  return QSize( size.width(), qMax( size.height(), fontHeight ) );
 }
 
 void QgsFontButton::showSettingsDialog()

Original file line number	Diff line number	Diff line change
`@@ -68,14 +68,17 @@ QgsColorButton::QgsColorButton( QWidget *parent, const QString &cdt, QgsColorSch`
`68`	`68`	`setPopupMode( QToolButton::MenuButtonPopup );`
`69`	`69`	`}`
`70`	`70`
`71`		`-QSize QgsColorButton::sizeHint() const`
	`71`	`+QSize QgsColorButton::minimumSizeHint() const`
`72`	`72`	`{`
`73`	`73`	`//make sure height of button looks good under different platforms`
	`74`	`+ QSize size;`
`74`	`75`	`#ifdef Q_OS_WIN`
`75`		`- return QSize( 120, 22 );`
	`76`	`+ size = QSize( 120, 22 );`
`76`	`77`	`#else`
`77`		`- return QSize( 120, 28 );`
	`78`	`+ size = QSize( 120, 28 );`
`78`	`79`	`#endif`
	`80`	`+ int textHeight = fontMetrics().height() * 1.1;`
	`81`	`+ return QSize( size.width(), qMax( size.height(), textHeight ) );`
`79`	`82`	`}`
`80`	`83`
`81`	`84`	`const QPixmap &QgsColorButton::transparentBackground()`
Original file line number	Diff line number	Diff line change
`@@ -51,11 +51,9 @@ QgsFontButton::QgsFontButton( QWidget *parent, const QString &dialogTitle )`
`51`	`51`	`QSize QgsFontButton::minimumSizeHint() const`
`52`	`52`	`{`
`53`	`53`	`//make sure height of button looks good under different platforms`
`54`		`-#ifdef Q_OS_WIN`
`55`		`- return QToolButton::minimumSizeHint();`
`56`		`-#else`
`57`		`- return QSize( 120, 28 );`
`58`		`-#endif`
	`54`	`+ QSize size = QToolButton::minimumSizeHint();`
	`55`	`+ int fontHeight = fontMetrics().height() * 1.4;`
	`56`	`+ return QSize( size.width(), qMax( size.height(), fontHeight ) );`
`59`	`57`	`}`
`60`	`58`
`61`	`59`	`void QgsFontButton::showSettingsDialog()`