-rw-r--r-- | noncore/games/solitaire/canvascardgame.cpp | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/noncore/games/solitaire/canvascardgame.cpp b/noncore/games/solitaire/canvascardgame.cpp index 32635a0..ef35287 100644 --- a/noncore/games/solitaire/canvascardgame.cpp +++ b/noncore/games/solitaire/canvascardgame.cpp | |||
@@ -31,2 +31,3 @@ | |||
31 | #include <qpainter.h> | 31 | #include <qpainter.h> |
32 | #include <qgfx_qws.h> | ||
32 | 33 | ||
@@ -73,2 +74,6 @@ void CanvasCardPile::addCard( CanvasCard *card ) | |||
73 | { | 74 | { |
75 | int offsetDown = ( qt_screen->deviceWidth() < 200 ) ? 9 : 13; | ||
76 | int cardHeight = ( qt_screen->deviceWidth() < 200 ) ? 27 : 36; | ||
77 | int cardWidth = ( qt_screen->deviceWidth() < 200 ) ? 20 : 23; | ||
78 | |||
74 | if ( !firstCard ) | 79 | if ( !firstCard ) |
@@ -76,7 +81,7 @@ void CanvasCardPile::addCard( CanvasCard *card ) | |||
76 | 81 | ||
77 | int height = 36 + pileHeight * 13; | 82 | int height = cardHeight + pileHeight * offsetDown; |
78 | setSize( 23, height ); | 83 | setSize( cardWidth, height ); |
79 | pile->resize( 23, height ); | 84 | pile->resize( cardWidth, height ); |
80 | QPainter p( pile ); | 85 | QPainter p( pile ); |
81 | p.translate( -card->x(), -card->y() + pileHeight * 13 ); | 86 | p.translate( -card->x(), -card->y() + pileHeight * offsetDown ); |
82 | card->draw( p ); | 87 | card->draw( p ); |
@@ -101,5 +106,5 @@ void CanvasCardPile::addCard( CanvasCard *card ) | |||
101 | 106 | ||
102 | tempImage32.setPixel( 21, 0, alpha ); | 107 | tempImage32.setPixel( cardWidth - 2, 0, alpha ); |
103 | tempImage32.setPixel( 22, 0, alpha ); | 108 | tempImage32.setPixel( cardWidth - 1, 0, alpha ); |
104 | tempImage32.setPixel( 22, 1, alpha ); | 109 | tempImage32.setPixel( cardWidth - 1, 1, alpha ); |
105 | height--; | 110 | height--; |
@@ -109,5 +114,5 @@ void CanvasCardPile::addCard( CanvasCard *card ) | |||
109 | 114 | ||
110 | tempImage32.setPixel( 21, height, alpha ); | 115 | tempImage32.setPixel( cardWidth - 2, height, alpha ); |
111 | tempImage32.setPixel( 22, height, alpha ); | 116 | tempImage32.setPixel( cardWidth - 1, height, alpha ); |
112 | tempImage32.setPixel( 22, height - 1, alpha ); | 117 | tempImage32.setPixel( cardWidth - 1, height - 1, alpha ); |
113 | } | 118 | } |
@@ -135,3 +140,3 @@ void CanvasCardPile::advance(int stage) | |||
135 | 140 | ||
136 | void CanvasCardPile::animatedMove(int x2, int y2, int steps = 7 ) | 141 | void CanvasCardPile::animatedMove(int x2, int y2, int steps ) |
137 | { | 142 | { |