Author: dreimer
Date: Wed Jul 30 12:00:40 2014
New Revision: 63782
URL:
http://svn.reactos.org/svn/reactos?rev=63782&view=rev
Log:
[SOLITAIRE]
My bad, I forgot to move the whole cards drawn centralized a bit higher to have the
missing frame below, but not additional space above making the frame waaay bigger.
Modified:
trunk/reactos/base/applications/games/solitaire/solcreate.cpp
trunk/reactos/base/applications/games/solitaire/solitaire.h
Modified: trunk/reactos/base/applications/games/solitaire/solcreate.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/solcreate.cpp [iso-8859-1] (original)
+++ trunk/reactos/base/applications/games/solitaire/solcreate.cpp [iso-8859-1] Wed Jul 30
12:00:40 2014
@@ -23,7 +23,7 @@
// Compute the value for yRowStackCardOffset based on the height of the card, so the
card number isn't hidden on larger cards
yRowStackCardOffset = (int)(__cardheight / 6.7);
- pDeck = SolWnd.CreateRegion(DECK_ID, true, X_BORDER, Y_BORDER, 2, 1);
+ pDeck = SolWnd.CreateRegion(DECK_ID, true, X_BORDER, Y_BORDERWITHFRAME, 2, 1);
pDeck->SetEmptyImage(CS_EI_CIRC);
pDeck->SetThreedCount(6);
pDeck->SetDragRule(CS_DRAG_NONE, 0);
@@ -32,7 +32,7 @@
pDeck->SetDblClickProc(DeckClickProc);
pDeck->SetFaceDirection(CS_FACE_DOWN, 0);
- pPile = SolWnd.CreateRegion(PILE_ID, true, X_BORDER + __cardwidth + X_PILE_BORDER,
Y_BORDER, CS_DEFXOFF, 1);
+ pPile = SolWnd.CreateRegion(PILE_ID, true, X_BORDER + __cardwidth + X_PILE_BORDER,
Y_BORDERWITHFRAME, CS_DEFXOFF, 1);
pPile->SetEmptyImage(CS_EI_NONE);
pPile->SetDragRule(CS_DRAG_TOP, 0);
pPile->SetDropRule(CS_DROP_NONE, 0);
@@ -45,7 +45,7 @@
//
for(i = 0; i < 4; i++)
{
- pSuitStack[i] = SolWnd.CreateRegion(SUIT_ID+i, true, 0, Y_BORDER, 0, 0);
+ pSuitStack[i] = SolWnd.CreateRegion(SUIT_ID+i, true, 0, Y_BORDERWITHFRAME, 0,
0);
pSuitStack[i]->SetEmptyImage(CS_EI_SUNK);
pSuitStack[i]->SetPlacement(CS_XJUST_CENTER, 0, i * (__cardwidth +
X_SUITSTACK_BORDER) , 0);
@@ -61,7 +61,7 @@
//
for(i = 0; i < NUM_ROW_STACKS; i++)
{
- pRowStack[i] = SolWnd.CreateRegion(ROW_ID+i, true, 0, Y_BORDER + __cardheight +
Y_ROWSTACK_BORDER, 0, yRowStackCardOffset);
+ pRowStack[i] = SolWnd.CreateRegion(ROW_ID+i, true, 0, Y_BORDERWITHFRAME +
__cardheight + Y_ROWSTACK_BORDER, 0, yRowStackCardOffset);
pRowStack[i]->SetEmptyImage(CS_EI_SUNK);
pRowStack[i]->SetFaceDirection(CS_FACE_DOWNUP, i);
Modified: trunk/reactos/base/applications/games/solitaire/solitaire.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/solitaire.h [iso-8859-1] (original)
+++ trunk/reactos/base/applications/games/solitaire/solitaire.h [iso-8859-1] Wed Jul 30
12:00:40 2014
@@ -51,7 +51,8 @@
#define X_PILE_BORDER 18
#define X_ROWSTACK_BORDER 10
#define X_SUITSTACK_BORDER 10
-#define Y_BORDER 38
+#define Y_BORDER 30
+#define Y_BORDERWITHFRAME 20
#define Y_ROWSTACK_BORDER 32
extern int yRowStackCardOffset;