1 files changed, 51 insertions, 20 deletions

diff --git a/noncore/games/solitaire/canvascard.cpp b/noncore/games/solitaire/canvascard.cpp
index ae3c859..7c4a5ba 100644
--- a/noncore/games/solitaire/canvascard.cpp
+++ b/noncore/games/solitaire/canvascard.cpp
@@ -18,24 +18,25 @@
 **
 **********************************************************************/
 
 #include "cardgame.h"
 #include "canvascard.h"
 
 #include <qpe/resource.h>
 
 #include <qpainter.h>
 #include <qimage.h>
 #include <qpaintdevice.h>
 #include <qbitmap.h>
+#include <qgfx_qws.h> // Needed to get the device's width
 
 #include <math.h>
 
 #if defined( QT_QWS_CASSIOPEIA )
 #define SLOW_HARDWARE
 #endif
 
 // Seems to be fast enough to me even without Transformations in the library
 //#if defined( QT_NO_TRANSFORMATIONS ) && defined( QT_QWS_IPAQ )
 //#define SLOW_HARDWARE
 //#endif
 
@@ -93,59 +94,81 @@ QPixmap *CreateScaledPixmap(QPixmap *srcPixmap, double scaleX, double scaleY)
 QPixmap *CanvasCard::cardsFaces = NULL;
 QPixmap *CanvasCard::cardsBacks = NULL;
 QBitmap *CanvasCard::cardsChars = NULL;
 QBitmap *CanvasCard::cardsSuits = NULL;
 QBitmap *CanvasCard::cardsCharsUpsideDown = NULL;
 QBitmap *CanvasCard::cardsSuitsUpsideDown = NULL;
 
 
 CanvasCard::CanvasCard( eValue v, eSuit s, bool f, QCanvas *canvas ) :
         Card(v, s, f), QCanvasRectangle( 0, 0, 1, 1, canvas ), cardBack(1), scaleX(1.0), scaleY(1.0)
 {
     if ( !cardsFaces ) {
-        cardsFaces = new QPixmap( Resource::loadPixmap( "cards/card_face" ) );
-        cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0001" ) );
-        cardsChars = new QBitmap( Resource::loadBitmap( "cards/card_chars" ) );
-        cardsSuits = new QBitmap( Resource::loadBitmap( "cards/card_suits" ) );
+        if ( qt_screen->deviceWidth() < 200 ) {
+            cardsFaces = new QPixmap( Resource::loadPixmap( "cards/card_face_small" ) );
+            cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0001_small" ) );
+            cardsChars = new QBitmap( Resource::loadBitmap( "cards/card_chars_small" ) );
+            cardsSuits = new QBitmap( Resource::loadBitmap( "cards/card_suits_small" ) );
+        } else {
+            cardsFaces = new QPixmap( Resource::loadPixmap( "cards/card_face" ) );
+            cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0001" ) );
+            cardsChars = new QBitmap( Resource::loadBitmap( "cards/card_chars" ) );
+            cardsSuits = new QBitmap( Resource::loadBitmap( "cards/card_suits" ) );
+        }
         cardsCharsUpsideDown = Create180RotatedBitmap( cardsChars );
         cardsSuitsUpsideDown = Create180RotatedBitmap( cardsSuits );
     }
     xOff = cardsFaces->width() / 2;
     yOff = cardsFaces->height() / 2;
     setSize( cardsFaces->width(), cardsFaces->height() );
     setPen( NoPen );
     flipping = FALSE;
 }
 
 
 void CanvasCard::setCardBack(int b)
 {
     if ( cardBack != b ) {
 
         cardBack = b;
 
         if ( cardsBacks )
             delete cardsBacks;
 
-        switch (cardBack) {
-            case 0:
-                cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0001" ) ); break;
-            case 1:
-                cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0002" ) ); break;
-            case 2:
-                cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0003" ) ); break;
-            case 3:
-                cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0004" ) ); break;
-            case 4:
-                cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0005" ) ); break;
+        if ( qt_screen->deviceWidth() < 200 ) {
+            switch (cardBack) {
+                case 0:
+                    cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0001_small" ) ); break;
+                case 1:
+                    cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0002_small" ) ); break;
+                case 2:
+                    cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0003_small" ) ); break;
+                case 3:
+                    cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0004_small" ) ); break;
+                case 4:
+                    cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0005_small" ) ); break;
+            }
+        } else {
+            switch (cardBack) {
+                case 0:
+                    cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0001" ) ); break;
+                case 1:
+                    cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0002" ) ); break;
+                case 2:
+                    cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0003" ) ); break;
+                case 3:
+                    cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0004" ) ); break;
+                case 4:
+                    cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0005" ) ); break;
+            }
         }
 
         if ( !isFacing() )
             redraw();
     }
 }
 
 
 void CanvasCard::draw(QPainter &painter)
 {
     int ix = (int)x(), iy = (int)y();
 
@@ -172,29 +195,37 @@ void CanvasCard::draw(QPainter &painter)
 */
 
         int w = cardsFaces->width(), h = cardsFaces->height();
 
         //p->setBrush( NoBrush );
         p->setBrush( QColor( 0xFF, 0xFF, 0xFF ) );
 
         if ( isRed() == TRUE )
             p->setPen( QColor( 0xFF, 0, 0 ) );
         else
             p->setPen( QColor( 0, 0, 0 ) );
 
-        p->drawPixmap( ix +      0, iy +     0, *cardsFaces );
-        p->drawPixmap( ix +      4, iy +     4, *cardsChars, 7*(getValue()-1), 0, 7, 7 );
-        p->drawPixmap( ix +     12, iy +     4, *cardsSuits, 7*(getSuit()-1), 0, 7, 8 );
-        p->drawPixmap( ix +  w-4-7, iy + h-4-7, *cardsCharsUpsideDown, 7*(12-getValue()+1), 0, 7, 7 );
-        p->drawPixmap( ix + w-12-7, iy + h-5-7, *cardsSuitsUpsideDown, 7*(3-getSuit()+1), 0, 7, 8 );
+        if ( qt_screen->deviceWidth() < 200 ) {
+            p->drawPixmap( ix +      0, iy +     0, *cardsFaces );
+            p->drawPixmap( ix +      3, iy +     3, *cardsChars, 5*(getValue()-1), 0, 5, 6 );
+            p->drawPixmap( ix +     11, iy +     3, *cardsSuits, 5*(getSuit()-1), 0, 5, 6 );
+            p->drawPixmap( ix +  w-3-5, iy + h-3-6, *cardsCharsUpsideDown, 5*(12-getValue()+1), 0, 5, 6 );
+            p->drawPixmap( ix + w-11-5, iy + h-3-6, *cardsSuitsUpsideDown, 5*(3-getSuit()+1), 0, 5, 6 );
+        } else {
+            p->drawPixmap( ix +      0, iy +     0, *cardsFaces );
+            p->drawPixmap( ix +      4, iy +     4, *cardsChars, 7*(getValue()-1), 0, 7, 7 );
+            p->drawPixmap( ix +     12, iy +     4, *cardsSuits, 7*(getSuit()-1), 0, 7, 8 );
+            p->drawPixmap( ix +  w-4-7, iy + h-4-7, *cardsCharsUpsideDown, 7*(12-getValue()+1), 0, 7, 7 );
+            p->drawPixmap( ix + w-12-7, iy + h-5-7, *cardsSuitsUpsideDown, 7*(3-getSuit()+1), 0, 7, 8 );
+        }
 
     } else {
         
         p->drawPixmap( ix, iy, *cardsBacks );
 
     }
 
     if (p != &painter)
     {
         p->end();
         QPixmap *scaledCard = CreateScaledPixmap( unscaledCard, scaleX, scaleY );
         int xoff = scaledCard->width() / 2;