[ros-diffs] [gschneider] 37913: - Fix drawing the status bar over the play cards, happened if no status bar was specified on sol startup (Win and ROS behavior); the bar has to be created to get the coords right - so we'll just hide it if we don't need it (like it's done when toggling status bar visibility in options) - Additional cleanup by Roel Messiant, <roelmessiant AT gmail DOT com>: - Replace the default options magic value by the proper constant - Status bar height was being set wrong, but the system'

Author: gschneider
Date: Sun Dec  7 12:04:56 2008
New Revision: 37913

URL: http://svn.reactos.org/svn/reactos?rev=37913&view=rev
Log:
- Fix drawing the status bar over the play cards, happened if no status bar was specified on sol startup (Win and ROS behavior); the bar has to be created to get the coords right - so we'll just hide it if we don't need it (like it's done when toggling status bar visibility in options)
- Additional cleanup by Roel Messiant, <roelmessiant AT gmail DOT com>:
- Replace the default options magic value by the proper constant
- Status bar height was being set wrong, but the system's constraint was fixing this behind the screens
- See bugs #3336 and #3820 for more info

Modified:
    trunk/reactos/base/applications/games/solitaire/solitaire.cpp

Modified: trunk/reactos/base/applications/games/solitaire/solitaire.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sol...
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/solitaire.cpp [iso-8859-1] (original)
+++ trunk/reactos/base/applications/games/solitaire/solitaire.cpp [iso-8859-1] Sun Dec  7 12:04:56 2008
@@ -20,7 +20,7 @@
 TCHAR MsgAbout[128];
 TCHAR MsgWin[128];
 TCHAR MsgDeal[128];
-DWORD dwOptions = 8;
+DWORD dwOptions = OPTION_THREE_CARDS;

CardWindow SolWnd;

@@ -477,6 +477,13 @@
             // Force the window to process WM_GETMINMAXINFO again
             GetWindowRect(hwndStatus, &rcStatus);
             nStatusHeight = rcStatus.bottom - rcStatus.top;
+
+            // Hide status bar if options say so
+            if (!(dwOptions & OPTION_SHOW_STATUS))
+            {
+                ShowWindow(hwndStatus, SW_HIDE);
+            }
+
             SetWindowPos(hwnd, NULL, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOZORDER);

NewGame();
@@ -497,8 +504,7 @@
             if (dwOptions & OPTION_SHOW_STATUS)
             {
                 MoveWindow(SolWnd, 0, 0, nWidth, nHeight - nStatusHeight, TRUE);
-                MoveWindow(hwndStatus, 0, nHeight - nStatusHeight, nWidth, nHeight, TRUE);
-                SendMessage(hwndStatus, WM_SIZE, wParam, lParam);
+                MoveWindow(hwndStatus, 0, nHeight - nStatusHeight, nWidth, nStatusHeight, TRUE);
             }
             else
             {