Backing out unintentional merge from TT branch.

1 files changed, 23 insertions, 0 deletions

diff --git a/noncore/games/solitaire/patiencecardgame.cpp b/noncore/games/solitaire/patiencecardgame.cpp
index 5a9326a..1501d2f 100644
--- a/noncore/games/solitaire/patiencecardgame.cpp
+++ b/noncore/games/solitaire/patiencecardgame.cpp
@@ -16,8 +16,9 @@
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
+#include <qgfx_qws.h>
 #include "patiencecardgame.h"
 
 
 int highestZ = 0;
@@ -27,8 +28,23 @@ PatienceCardGame::PatienceCardGame(QCanvas *c, bool snap, QWidget *parent) : Can
 {
     numberOfTimesThroughDeck = 0;
     highestZ = 0;
 
+    if ( qt_screen->deviceWidth() < 200 ) {
+	circleCross = new CanvasCircleOrCross( 7, 16, canvas() );
+	rectangle = new CanvasRoundRect(  30, 10, canvas() );
+
+	for (int i = 0; i < 4; i++) {
+	    discardPiles[i] = new PatienceDiscardPile( 78 + i * 23, 10, canvas() );
+	    addCardPile(discardPiles[i]);
+	}
+	for (int i = 0; i < 7; i++) {
+	    workingPiles[i] = new PatienceWorkingPile( 5 + i * 23, 50, canvas() );
+	    addCardPile(workingPiles[i]);
+	}
+	faceDownDealingPile = new PatienceFaceDownDeck( 5, 10, canvas() );
+	faceUpDealingPile   = new PatienceFaceUpDeck( 30, 10, canvas() );
+    } else {
     circleCross = new CanvasCircleOrCross( 7, 18, canvas() );
     rectangle = new CanvasRoundRect(  35, 10, canvas() );
 
     for (int i = 0; i < 4; i++) {
@@ -41,8 +57,9 @@ PatienceCardGame::PatienceCardGame(QCanvas *c, bool snap, QWidget *parent) : Can
     }
     faceDownDealingPile = new PatienceFaceDownDeck( 5, 10, canvas() );
     faceUpDealingPile   = new PatienceFaceUpDeck( 35, 10, canvas() );
 }
+}
 
 
 PatienceCardGame::~PatienceCardGame()
 {
@@ -172,8 +189,11 @@ bool PatienceCardGame::mousePressCard( Card *card, QPoint p )
 	    faceDownDealingPile->removeCard(item);
 	    faceUpDealingPile->addCardToTop(item);
 	    item->setCardPile( faceUpDealingPile );
 
+	    if ( qt_screen->deviceWidth() < 200 )
+		item->flipTo( 30, (int)item->y() );
+	    else
 	    item->flipTo( 35, (int)item->y() );
 	}
 	moving = NULL;
 	moved = FALSE;
@@ -194,8 +214,11 @@ bool PatienceCardGame::mousePressCard( Card *card, QPoint p )
 		faceDownDealingPile->removeCard(item);
 		faceUpDealingPile->addCardToTop(item);
 		item->setCardPile( faceUpDealingPile );
 
+		if ( qt_screen->deviceWidth() < 200 )
+		    item->flipTo( 30, (int)item->y(), 8 * flipped );
+		else
 		item->flipTo( 35, (int)item->y(), 8 * flipped );
 	    }
 	}