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

trunk/src/widgets/qspinwidget.cpp

@@ -136 +136 @@
 
     uint oldButtonDown = d->buttonDown;
-
+    d->buttonDown = 0;
+
+    // With Warp, the up and down buttons are diagonally separated,
+    // so we are disabling the down button entirely and have to find
+    // out the position of the click within the up button in order
+    // to find out what the user wants!
+    int guiStyle = style().styleHint( QStyle::SH_GUIStyle );
+    if ( guiStyle == QStyle::PMStyle ) {
+        if ( d->up.contains( e->pos() ) ) {
+            QPoint rp = e->pos() - d->up.topLeft();
+            if ( d->up.width() > (rp.x() + rp.y()) ) {
+                if ( d->upEnabled )
+                    d->buttonDown = 2;
+            } else {
+                if ( d->downEnabled )
+                    d->buttonDown = 1;
+            }
+        }
+    } else {
     if ( d->down.contains( e->pos() ) && d->downEnabled )
         d->buttonDown = 1;
     else if ( d->up.contains( e->pos() ) && d->upEnabled )
         d->buttonDown = 2;
-    else
-        d->buttonDown = 0;
+    }
 
     d->theButton = d->buttonDown;
@@ -149 +166 @@
             repaint( d->down.unite( d->up ), FALSE );
         } else if ( d->buttonDown & 1 ) {
+            // do all with the "up" button in PM style - see note above
+            if ( guiStyle == QStyle::PMStyle )
+                repaint( d->up, FALSE );
+            else
             repaint( d->down, FALSE );
             stepDown();
+            if ( guiStyle == QStyle::PMStyle )
+                d->startTimer( TRUE, 300 );
+            else
             d->startTimer( FALSE, 300 );
         } else if ( d->buttonDown & 2 ) {
@@ -245 +269 @@
     d->theButton = 0;
     if ( oldButtonDown != d->theButton ) {
-        if ( oldButtonDown & 1 )
+        // do all with the "up" button in PM style -
+        // see note in mousePressEvent
+        int guiStyle = style().styleHint( QStyle::SH_GUIStyle );
+        if ( guiStyle == QStyle::PMStyle )
+            repaint( d->up, FALSE );
+        else if ( oldButtonDown & 1 )
             repaint( d->down, FALSE );
         else if ( oldButtonDown & 2 )
@@ -264 +293 @@
         return;
 
+    // do all with the "up" button in PM style -
+    // see note in mousePressEvent
+    int guiStyle = style().styleHint( QStyle::SH_GUIStyle );
+    uint clickButton = 0;
+    if ( guiStyle == QStyle::PMStyle ) {
+        if( d->up.contains( e->pos() ) ) {
+            QPoint rp = e->pos() - d->up.topLeft();
+            if ( d->up.width() > (rp.x() + rp.y()) )
+                clickButton = 2;
+            else
+                clickButton = 1;
+        }
+    } else {
+        if ( d->down.contains(e->pos()) )
+            clickButton = 1;
+        else if ( d->up.contains(e->pos()) )
+            clickButton = 2;
+    }
+
     uint oldButtonDown = d->theButton;
-    if ( oldButtonDown & 1 && !d->down.contains( e->pos() ) ) {
+    if ( (oldButtonDown & 1) && !(clickButton & 1) ) {
+    //if ( oldButtonDown & 1 && !d->down.contains( e->pos() ) ) {
         d->stopTimer();
         d->theButton = 0;
+        if ( guiStyle == QStyle::PMStyle )
+            repaint( d->up, FALSE );
+        else
         repaint( d->down, FALSE );
-    } else if ( oldButtonDown & 2 && !d->up.contains( e->pos() ) ) {
+    } else if( (oldButtonDown & 2) && !(clickButton & 2) ) {
+    //} else if ( oldButtonDown & 2 && !d->up.contains( e->pos() ) ) {
         d->stopTimer();
         d->theButton = 0;
         repaint( d->up, FALSE );
-    } else if ( !oldButtonDown && d->up.contains( e->pos() ) && d->buttonDown & 2 ) {
+    } else if ( !oldButtonDown && (clickButton & 2) && (d->buttonDown & 2) ) {
+    //} else if ( !oldButtonDown && d->up.contains( e->pos() ) && d->buttonDown & 2 ) {
         d->startTimer( 500 );
         d->theButton = 2;
         repaint( d->up, FALSE );
-    } else if ( !oldButtonDown && d->down.contains( e->pos() ) && d->buttonDown & 1 ) {
+    } else if(!oldButtonDown && (clickButton & 1) && (d->buttonDown & 1)) {
+    //} else if ( !oldButtonDown && d->down.contains( e->pos() ) && d->buttonDown & 1 ) {
         d->startTimer( 500 );
         d->theButton = 1;
+        if ( guiStyle == QStyle::PMStyle )
+            repaint( d->up, FALSE );
+        else
         repaint( d->down, FALSE );
     }