Backing out unintentional merge from TT branch.

1 files changed, 5 insertions, 2 deletions

diff --git a/noncore/games/solitaire/patiencecardgame.h b/noncore/games/solitaire/patiencecardgame.h
index c4f6c48..0d0e3d5 100644
--- a/noncore/games/solitaire/patiencecardgame.h
+++ b/noncore/games/solitaire/patiencecardgame.h
@@ -22,12 +22,13 @@
 
 
 #include <qpopupmenu.h>
 #include <qmainwindow.h>
 #include <qintdict.h>
 #include <qcanvas.h>
+#include <qgfx_qws.h>
 // #include "canvascardshapes.h"
 // #include "canvascard.h"
 #include "canvascardgame.h"
 
 
 class PatienceFaceDownDeck : public CardPile, public CanvasRoundRect
@@ -127,28 +128,30 @@ public:
             setNextX( pileX );
                 setNextY( pileY );
             return;
         } else {
             top = getCardPos(NULL);
             if ( newTopCard->isFacing() == FALSE ) {
+                int offsetDown = ( qt_screen->deviceWidth() < 200 ) ? 9 : 13;
                 // correct the position taking in to account the card is not
                 // yet flipped, but will become flipped
                 top = QPoint( top.x() - 1, top.y() - 3 );
                 newTopCard->flipTo( top.x(), top.y() );
-                top = QPoint( top.x(), top.y() + 13 );
+                top = QPoint( top.x(), top.y() + offsetDown );
             }
                 setNextX( top.x() );
             setNextY( top.y() );
         }
     }
     virtual QPoint getCardPos(Card *c) {
         int x = pileX, y = pileY;
         Card *card = cardOnBottom();
         while ((card != c) && (card != NULL)) {
             if (card->isFacing()) {
-                y += 13;    
+                int offsetDown = ( qt_screen->deviceWidth() < 200 ) ? 9 : 13;
+                y += offsetDown; 
             } else {
                 x += 1;    
                 y += 3;
             }
             card = cardInfront(card); 
         }