[SPIDER]

Optimize borders and space to the window frame even more. Hopefully fixes spider being too big for 800x600 problem.
CORE-8409 #comment Committed a "fix", please retest.

svn path=/trunk/; revision=63816

diff --git a/reactos/base/applications/games/spider/spider.cpp b/reactos/base/applications/games/spider/spider.cpp
index b59bc33..b4ec3f1 100644 (file)
--- a/reactos/base/applications/games/spider/spider.cpp
+++ b/reactos/base/applications/games/spider/spider.cpp
@@ -359,7 +359,7 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
             MINMAXINFO *mmi;
 
             mmi = (MINMAXINFO *)lParam;
-            mmi->ptMinTrackSize.x = NUM_STACKS * __cardwidth + (NUM_STACKS + 3) * X_BORDER + 20; // Border left and right of 10px
+            mmi->ptMinTrackSize.x = NUM_STACKS * __cardwidth + (NUM_STACKS + 3) * X_BORDER + 12; // Border left and right of 6px
             mmi->ptMinTrackSize.y = GetSystemMetrics(SM_CYCAPTION) +
                                     GetSystemMetrics(SM_CYMENU) +
                                     2 * Y_BORDER +

diff --git a/reactos/base/applications/games/spider/spider.h b/reactos/base/applications/games/spider/spider.h
index 5385de7..ff633c6 100644 (file)
--- a/reactos/base/applications/games/spider/spider.h
+++ b/reactos/base/applications/games/spider/spider.h
@@ -15,8 +15,8 @@
 #define CARDBACK_OPTIONS_WIDTH   72
 #define CARDBACK_OPTIONS_HEIGHT  112
 
-#define X_BORDER                  6
-#define Y_BORDER                  6
+#define X_BORDER                  4
+#define Y_BORDER                  4
 
 #define NUM_STACKS         10
 

diff --git a/reactos/base/applications/games/spider/spigame.cpp b/reactos/base/applications/games/spider/spigame.cpp
index f56f206..87cd6a2 100644 (file)
--- a/reactos/base/applications/games/spider/spigame.cpp
+++ b/reactos/base/applications/games/spider/spigame.cpp
@@ -298,7 +298,7 @@ void CreateSpider()
         pStack[i]->SetFaceDirection(CS_FACE_DOWN, 0);
         pos = i - NUM_STACKS/2;
         pStack[i]->SetPlacement(CS_XJUST_CENTER, 0,
-            pos * (__cardwidth + X_BORDER) + 6 * X_BORDER, 0);
+            pos * (__cardwidth + X_BORDER) + 6 * (X_BORDER + 2) + 2, 0);
         pStack[i]->SetEmptyImage(CS_EI_SUNK);
         pStack[i]->SetDragRule(CS_DRAG_CALLBACK, StackDragProc);
         pStack[i]->SetDropRule(CS_DROP_CALLBACK, StackDropProc);