Changeset 11078

Timestamp:

Jul 31, 2010, 6:55:26 AM (12 years ago)

Author:

charles

Message:

(trunk qt) fix icon spacing issue in Oxygen theme

File:

• trunk/qt/filterbar.cc (modified) (5 diffs)

trunk/qt/filterbar.cc

@@ -11 +11 @@
  */
 
-#include <iostream>
-
 #include <QString>
 #include <QtGui>
@@ -39 +37 @@
 };
 
+namespace
+{
+    int getHSpacing( QWidget * w )
+    {
+        return qMax( 4, w->style()->pixelMetric( QStyle::PM_LayoutHorizontalSpacing, 0, w ) );
+    }
+}
+
 FilterBarComboBoxDelegate :: FilterBarComboBoxDelegate( QObject * parent, QComboBox * combo ):
     QItemDelegate( parent ),
@@ -81 +87 @@
         QRect boundingBox = option.rect;
 
-        const int hmargin = myCombo->style()->pixelMetric( QStyle::PM_LayoutHorizontalSpacing, 0, myCombo );
+        const int hmargin = getHSpacing( myCombo );
         boundingBox.setLeft( boundingBox.left() + hmargin );
         boundingBox.setRight( boundingBox.right() - hmargin );
@@ -122 +128 @@
     {
         QStyle * s = myCombo->style( );
-        const int hmargin = s->pixelMetric( QStyle::PM_LayoutHorizontalSpacing, 0, myCombo );
-
+        const int hmargin = getHSpacing( myCombo );
 
         QSize size = QItemDelegate::sizeHint( option, index );
@@ -162 +167 @@
         QStyle * s = style();
         QRect rect = s->subControlRect( QStyle::CC_ComboBox, &opt, QStyle::SC_ComboBoxEditField, this );
-        const int hmargin = s->pixelMetric( QStyle::PM_LayoutHorizontalSpacing, 0, this );
+        const int hmargin = getHSpacing( this );
         rect.setRight( rect.right() - hmargin );