Changeset 174 for trunk/src/widgets/qdatetimeedit.cpp

Timestamp:

Nov 6, 2007, 11:27:57 PM (18 years ago)

Author:

dmik

Message:

Styles: Implemented the first version of the Warp4 style (contributed by Cornelis Bockemuehl).

File:

• trunk/src/widgets/qdatetimeedit.cpp (modified) (3 diffs)

trunk/src/widgets/qdatetimeedit.cpp

@@ -1081 +1081 @@
     QFontMetrics fm( font() );
     int fw = style().pixelMetric( QStyle::PM_DefaultFrameWidth, this );
-    int h = QMAX( fm.lineSpacing(), 14 ) + 2;
+    int h = QMAX( fm.lineSpacing(), 14 );
+    if ( style().styleHint( QStyle::SH_GUIStyle ) != QStyle::PMStyle )
+        h += 2;
     int w = 2 + fm.width( '9' ) * 8 + fm.width( d->ed->separator() ) * 2 + d->controls->upRect().width() + fw * 4;
 
-    return QSize( w, QMAX(h + fw * 2,20) ).expandedTo( QApplication::globalStrut() );
+    return QSize( w, QMAX(h + fw * 2, 20) ).expandedTo( QApplication::globalStrut() );
 }
 
@@ -2526 +2528 @@
     QFontMetrics fm( font() );
     int fw = style().pixelMetric( QStyle::PM_DefaultFrameWidth, this );
-    int h = fm.lineSpacing() + 2;
+    int h = fm.lineSpacing();
+    if ( style().styleHint( QStyle::SH_GUIStyle ) != QStyle::PMStyle )
+        h += 2;
     int w = 2 + fm.width( '9' ) * 6 + fm.width( d->ed->separator() ) * 2 +
         d->controls->upRect().width() + fw * 4;
@@ -2536 +2540 @@
     }
 
-    return QSize( w, QMAX(h + fw * 2,20) ).expandedTo( QApplication::globalStrut() );
+    return QSize( w, QMAX(h + fw * 2, 20) ).expandedTo( QApplication::globalStrut() );
 }