Changeset 174 for trunk/src/widgets/qmenubar.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/qmenubar.cpp (modified) (5 diffs)

trunk/src/widgets/qmenubar.cpp

@@ -295 +295 @@
     int h = 2*motifBarVMargin + fm.height() + motifItemVMargin + 2*frameWidth() + 2*motifItemFrame;
 
+    if ( style().styleHint( QStyle::SH_GUIStyle ) == QStyle::PMStyle )
+        h++;
+
     setGeometry( 0, 0, width(), h );
 
@@ -483 +486 @@
 void QMenuBar::languageChange()
 {
-    menuContentsChanged(); 
+    menuContentsChanged();
 }
 
@@ -729 +732 @@
     bool reverse = QApplication::reverseLayout();
     const int yoffset = 1; //(style().styleHint( QStyle::SH_GUIStyle ) == QStyle::WindowsStyle) ? 4 : 1; ### this breaks designer mainwindow editing
-    QPoint pos = r.bottomLeft() + QPoint(0,yoffset);
+    // Warp4style: popup menus are displaced by 4
+    const int xoffset = ( style().styleHint( QStyle::SH_GUIStyle ) == QStyle::PMStyle ) ? -4 : 0;
+    QPoint pos = r.bottomLeft() + QPoint( xoffset, yoffset );
     if( reverse ) {
-        pos = r.bottomRight() + QPoint(0,yoffset);
+        pos = r.bottomRight() + QPoint( -xoffset, yoffset );
         pos.rx() -= popup->sizeHint().width();
     }
@@ -913 +918 @@
         x += 2;
         y += 2;
+    } else if ( gs == PMStyle ) {
+        x += 4;
     }
     if ( reverse )
@@ -976 +983 @@
                     x += motifBarHMargin;
                     y += motifBarVMargin;
+                } else if ( gs == PMStyle ) {
+                    x += 5;
                 }
                 if ( reverse )