Add a platform-specific size hint for QgsColorButtonV2 (refs #11060)

qgis · Aug 25, 2014 · 8766cd1 · 8766cd1
1 parent 31c055d
commit 8766cd1
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/src/gui/qgscolorbuttonv2.cpp b/src/gui/qgscolorbuttonv2.cpp
@@ -69,6 +69,16 @@ QgsColorButtonV2::~QgsColorButtonV2()
 {
 }
 
+QSize QgsColorButtonV2::sizeHint() const
+{
+  //make sure height of button looks good under different platforms
+#ifdef Q_WS_WIN
+  return QSize( 120, 22 );
+#else
+  return QSize( 120, 28 );
+#endif
+}
+
 const QPixmap& QgsColorButtonV2::transparentBackground()
 {
   static QPixmap transpBkgrd;
@@ -524,7 +534,12 @@ void QgsColorButtonV2::setButtonBackground( const QColor color )
     initStyleOption( &opt );
     QRect buttonSize = QApplication::style()->subControlRect( QStyle::CC_ToolButton, &opt, QStyle::SC_ToolButton,
                        this );
-    mIconSize = QSize( buttonSize.width() - 10, buttonSize.height() - 10 );
+    //make sure height of icon looks good under different platforms
+#ifdef Q_WS_WIN
+    mIconSize = QSize( buttonSize.width() - 10, height() - 14 );
+#else
+    mIconSize = QSize( buttonSize.width() - 10, height() - 12 );
+#endif
   }
   //create an icon pixmap
   QPixmap pixmap( mIconSize );

diff --git a/src/gui/qgscolorbuttonv2.h b/src/gui/qgscolorbuttonv2.h
@@ -53,6 +53,8 @@ class GUI_EXPORT QgsColorButtonV2: public QToolButton
 
     virtual ~QgsColorButtonV2();
 
+    virtual QSize sizeHint() const;
+
     /**Return the currently selected color.
      * @returns currently selected color
      * @see setColor