[ros-diffs] [ekohl] 28179: Add the status bar.

Author: ekohl
Date: Sun Aug  5 22:56:39 2007
New Revision: 28179

URL: http://svn.reactos.org/svn/reactos?rev=28179&view=rev
Log:
Add the status bar.

Modified:
    trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc
    trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc
    trunk/reactos/base/applications/games/solitaire/lang/el-GR.rc
    trunk/reactos/base/applications/games/solitaire/lang/en-US.rc
    trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc
    trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc
    trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc
    trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc
    trunk/reactos/base/applications/games/solitaire/lang/nb-NO.rc
    trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc
    trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc
    trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc
    trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc
    trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc
    trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc
    trunk/reactos/base/applications/games/solitaire/solitaire.cpp
    trunk/reactos/base/applications/games/solitaire/solitaire.h

Modified: trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc Sun Aug  5 22:56:39
2007
@@ -22,7 +22,7 @@
     AUTORADIOBUTTON "Èçòåãëè &òðè", IDC_OPT_DRAWTHREE, 14, 32, 70, 10
 
     AUTOCHECKBOX    "&Ïîêàçâàíå íà âðåìåòî", IDC_OPT_SHOWTIME, 7 ,51 ,100
,10, WS_TABSTOP | WS_DISABLED
-    AUTOCHECKBOX    "Ëåíòà &ñúñòîÿíèå", IDC_OPT_STATUSBAR, 7, 66, 100, 10,
WS_TABSTOP | WS_DISABLED
+    AUTOCHECKBOX    "Ëåíòà &ñúñòîÿíèå", IDC_OPT_STATUSBAR, 7, 66, 100, 10,
WS_TABSTOP
 
     DEFPUSHBUTTON   "Äîáðå", IDOK, 35, 97, 50, 14
     PUSHBUTTON      "Îòêàç", IDCANCEL, 101, 97, 50, 14

Modified: trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc Sun Aug  5 22:56:39
2007
@@ -22,7 +22,7 @@
     AUTORADIOBUTTON "&Drei ziehen", IDC_OPT_DRAWTHREE, 14, 32, 52, 10
 
     AUTOCHECKBOX    "&Zeit anzeigen", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10,
WS_TABSTOP | WS_DISABLED
-    AUTOCHECKBOX    "S&tatusleiste", IDC_OPT_STATUSBAR, 7, 66, 64, 10,
WS_TABSTOP | WS_DISABLED
+    AUTOCHECKBOX    "S&tatusleiste", IDC_OPT_STATUSBAR, 7, 66, 64, 10,
WS_TABSTOP
 
     DEFPUSHBUTTON   "OK",IDOK,35,97,50,14
     PUSHBUTTON      "Abbrechen",IDCANCEL,101,97,50,14

Modified: trunk/reactos/base/applications/games/solitaire/lang/el-GR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/el-GR.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/el-GR.rc Sun Aug  5 22:56:39
2007
@@ -22,7 +22,7 @@
     AUTORADIOBUTTON "Ñßîå &Ôñßá", IDC_OPT_DRAWTHREE, 14, 32, 52, 10
 
     AUTOCHECKBOX    "&ÅìöÜíéóç ¿ñáò", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10,
WS_TABSTOP | WS_DISABLED
-    AUTOCHECKBOX    "Ã&ñáììÞ êáôÜóôáóçò", IDC_OPT_STATUSBAR, 7, 66, 64, 10,
WS_TABSTOP | WS_DISABLED
+    AUTOCHECKBOX    "Ã&ñáììÞ êáôÜóôáóçò", IDC_OPT_STATUSBAR, 7, 66, 64, 10,
WS_TABSTOP
 
     DEFPUSHBUTTON   "OK", IDOK, 35, 97, 50, 14
     PUSHBUTTON      "Áêýñùóç", IDCANCEL, 101, 97, 50, 14

Modified: trunk/reactos/base/applications/games/solitaire/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/en-US.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/en-US.rc Sun Aug  5 22:56:39
2007
@@ -22,7 +22,7 @@
     AUTORADIOBUTTON "Draw &Three", IDC_OPT_DRAWTHREE, 14, 32, 52, 10
 
     AUTOCHECKBOX    "&Show Time", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10,
WS_TABSTOP | WS_DISABLED
-    AUTOCHECKBOX    "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10,
WS_TABSTOP | WS_DISABLED
+    AUTOCHECKBOX    "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10,
WS_TABSTOP
 
     DEFPUSHBUTTON   "OK", IDOK, 35, 97, 50, 14
     PUSHBUTTON      "Cancel", IDCANCEL, 101, 97, 50, 14

Modified: trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc Sun Aug  5 22:56:39
2007
@@ -22,7 +22,7 @@
     AUTORADIOBUTTON "Draw &Three", IDC_OPT_DRAWTHREE, 14, 32, 52, 10
 
     AUTOCHECKBOX    "&Show Time", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10,
WS_TABSTOP | WS_DISABLED
-    AUTOCHECKBOX    "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10,
WS_TABSTOP | WS_DISABLED
+    AUTOCHECKBOX    "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10,
WS_TABSTOP
 
     DEFPUSHBUTTON   "Aceptar", IDOK, 35, 97, 50, 14
     PUSHBUTTON      "Cancelar", IDCANCEL, 101, 97, 50, 14

Modified: trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc Sun Aug  5 22:56:39
2007
@@ -22,7 +22,7 @@
     AUTORADIOBUTTON "En tirer trois", IDC_OPT_DRAWTHREE, 14, 32, 52, 10
 
     AUTOCHECKBOX    "Afficher le temp&s", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10,
WS_TABSTOP | WS_DISABLED
-    AUTOCHECKBOX    "Barre de s&tatus", IDC_OPT_STATUSBAR, 7, 66, 64, 10,
WS_TABSTOP | WS_DISABLED
+    AUTOCHECKBOX    "Barre de s&tatus", IDC_OPT_STATUSBAR, 7, 66, 64, 10,
WS_TABSTOP
 
     DEFPUSHBUTTON   "OK", IDOK, 35, 97, 50, 14
     PUSHBUTTON      "Annuler", IDCANCEL, 101, 97, 50, 14

Modified: trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc Sun Aug  5 22:56:39
2007
@@ -23,7 +23,7 @@
     AUTORADIOBUTTON "Draw &Three", IDC_OPT_DRAWTHREE, 14, 32, 52, 10
 
     AUTOCHECKBOX    "&Show Time", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10,
WS_TABSTOP | WS_DISABLED
-    AUTOCHECKBOX    "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10,
WS_TABSTOP | WS_DISABLED
+    AUTOCHECKBOX    "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10,
WS_TABSTOP
 
     DEFPUSHBUTTON   "OK", IDOK, 35, 97, 50, 14
     PUSHBUTTON      "Batal", IDCANCEL, 101, 97, 50, 14

Modified: trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc Sun Aug  5 22:56:39
2007
@@ -23,7 +23,7 @@
     AUTORADIOBUTTON "Girane &Tre", IDC_OPT_DRAWTHREE, 14, 32, 52, 10
 
     AUTOCHECKBOX    "&Visualizza il tempo", IDC_OPT_SHOWTIME, 7 ,51 ,65
,10, WS_TABSTOP | WS_DISABLED
-    AUTOCHECKBOX    "&Barra di stato", IDC_OPT_STATUSBAR, 7, 66, 64, 10,
WS_TABSTOP | WS_DISABLED
+    AUTOCHECKBOX    "&Barra di stato", IDC_OPT_STATUSBAR, 7, 66, 64, 10,
WS_TABSTOP
 
     DEFPUSHBUTTON   "OK", IDOK, 35, 97, 50, 14
     PUSHBUTTON      "Annulla", IDCANCEL, 101, 97, 50, 14

Modified: trunk/reactos/base/applications/games/solitaire/lang/nb-NO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/nb-NO.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/nb-NO.rc Sun Aug  5 22:56:39
2007
@@ -23,7 +23,7 @@
     AUTORADIOBUTTON "Draw &Three", IDC_OPT_DRAWTHREE, 14, 32, 52, 10
 
     AUTOCHECKBOX    "&Show Time", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10,
WS_TABSTOP | WS_DISABLED
-    AUTOCHECKBOX    "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10,
WS_TABSTOP | WS_DISABLED
+    AUTOCHECKBOX    "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10,
WS_TABSTOP
 
     DEFPUSHBUTTON   "OK", IDOK, 35, 97, 50, 14
     PUSHBUTTON      "Avbryt", IDCANCEL, 101, 97, 50, 14

Modified: trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc Sun Aug  5 22:56:39
2007
@@ -21,7 +21,7 @@
     AUTORADIOBUTTON "Rozdaj &dwie", IDC_OPT_DRAWTHREE, 14, 32, 52, 10
 
     AUTOCHECKBOX    "&Pokazuj czas gry", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10,
WS_TABSTOP | WS_DISABLED
-    AUTOCHECKBOX    "Pokazuj pa&sek stanu", IDC_OPT_STATUSBAR, 7, 66, 64,
10, WS_TABSTOP | WS_DISABLED
+    AUTOCHECKBOX    "Pokazuj pa&sek stanu", IDC_OPT_STATUSBAR, 7, 66, 64,
10, WS_TABSTOP
 
     DEFPUSHBUTTON   "OK", IDOK, 35, 97, 50, 14
     PUSHBUTTON      "Anuluj", IDCANCEL, 101, 97, 50, 14

Modified: trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc Sun Aug  5 22:56:39
2007
@@ -17,7 +17,7 @@
     AUTORADIOBUTTON "Ïî &òðè", IDC_OPT_DRAWTHREE, 14, 32, 52, 10
 
     AUTOCHECKBOX    "&Ïîêàçûâàòü âðåìÿ", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10,
WS_TABSTOP | WS_DISABLED
-    AUTOCHECKBOX    "&Ñòðîêà ñîñòîÿíèÿ", IDC_OPT_STATUSBAR, 7, 66, 64, 10,
WS_TABSTOP | WS_DISABLED
+    AUTOCHECKBOX    "&Ñòðîêà ñîñòîÿíèÿ", IDC_OPT_STATUSBAR, 7, 66, 64, 10,
WS_TABSTOP
 
     DEFPUSHBUTTON   "OK", IDOK, 35, 97, 50, 14
     PUSHBUTTON      "Îòìåíà", IDCANCEL, 101, 97, 50, 14

Modified: trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc Sun Aug  5 22:56:39
2007
@@ -24,7 +24,7 @@
     AUTORADIOBUTTON "aha &tri", IDC_OPT_DRAWTHREE, 14, 32, 52, 10
 
     AUTOCHECKBOX    "Èa&sový limit", IDC_OPT_SHOWTIME, 7 ,51 ,64 ,10,
WS_TABSTOP | WS_DISABLED
-    AUTOCHECKBOX    "Stavový riad&ok", IDC_OPT_STATUSBAR, 7, 66, 64, 10,
WS_TABSTOP | WS_DISABLED
+    AUTOCHECKBOX    "Stavový riad&ok", IDC_OPT_STATUSBAR, 7, 66, 64, 10,
WS_TABSTOP
 
     DEFPUSHBUTTON   "OK", IDOK, 35, 97, 50, 14
     PUSHBUTTON      "Zruši", IDCANCEL, 101, 97, 50, 14

Modified: trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc Sun Aug  5 22:56:39
2007
@@ -23,7 +23,7 @@
     AUTORADIOBUTTON "Draw &Three", IDC_OPT_DRAWTHREE, 14, 32, 52, 10
 
     AUTOCHECKBOX    "&Show Time", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10,
WS_TABSTOP | WS_DISABLED
-    AUTOCHECKBOX    "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10,
WS_TABSTOP | WS_DISABLED
+    AUTOCHECKBOX    "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10,
WS_TABSTOP
 
     DEFPUSHBUTTON   "µ¡Å§", IDOK, 35, 97, 50, 14
     PUSHBUTTON      "¡àÅÔ¡", IDCANCEL, 101, 97, 50, 14

Modified: trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc Sun Aug  5 22:56:39
2007
@@ -22,7 +22,7 @@
     AUTORADIOBUTTON "Ï&î òðè", IDC_OPT_DRAWTHREE, 14, 32, 52, 10
 
     AUTOCHECKBOX    "&Ãðà çà ÷àñîì", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10,
WS_TABSTOP | WS_DISABLED
-    AUTOCHECKBOX    "&Ðÿäîê ñòàíó", IDC_OPT_STATUSBAR, 7, 66, 64, 10,
WS_TABSTOP | WS_DISABLED
+    AUTOCHECKBOX    "&Ðÿäîê ñòàíó", IDC_OPT_STATUSBAR, 7, 66, 64, 10,
WS_TABSTOP
 
     DEFPUSHBUTTON   "OK", IDOK, 35, 97, 50, 14
     PUSHBUTTON      "Ñêàñóâàòè", IDCANCEL, 101, 97, 50, 14

Modified: trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc Sun Aug  5 22:56:39
2007
@@ -23,7 +23,7 @@
     AUTORADIOBUTTON "Draw &Three", IDC_OPT_DRAWTHREE, 14, 32, 52, 10
 
     AUTOCHECKBOX    "&Show Time", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10,
WS_TABSTOP | WS_DISABLED
-    AUTOCHECKBOX    "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10,
WS_TABSTOP | WS_DISABLED
+    AUTOCHECKBOX    "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10,
WS_TABSTOP
 
     DEFPUSHBUTTON   "È·¶¨", IDOK, 35, 97, 50, 14
     PUSHBUTTON      "È¡Ïû", IDCANCEL, 101, 97, 50, 14

Modified: trunk/reactos/base/applications/games/solitaire/solitaire.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/solitaire.cpp (original)
+++ trunk/reactos/base/applications/games/solitaire/solitaire.cpp Sun Aug  5 22:56:39
2007
@@ -206,6 +206,9 @@
         CheckRadioButton(hDlg, IDC_OPT_DRAWONE, IDC_OPT_DRAWTHREE,
                          (dwOptions & OPTION_THREE_CARDS) ? IDC_OPT_DRAWTHREE :
IDC_OPT_DRAWONE);
 
+        CheckDlgButton(hDlg,
+                       IDC_OPT_STATUSBAR,
+                       (dwOptions & OPTION_SHOW_STATUS) ? BST_CHECKED :
BST_UNCHECKED);
         return TRUE;
 
     case WM_COMMAND:
@@ -216,6 +219,11 @@
             if (IsDlgButtonChecked(hDlg, IDC_OPT_DRAWTHREE) == BST_CHECKED)
                 dwOptions |= OPTION_THREE_CARDS;
 
+            if (IsDlgButtonChecked(hDlg, IDC_OPT_STATUSBAR) == BST_CHECKED)
+                dwOptions |= OPTION_SHOW_STATUS;
+            else
+                dwOptions &= ~OPTION_SHOW_STATUS;
+
             EndDialog(hDlg, TRUE);
             return TRUE;
 
@@ -231,11 +239,34 @@
 VOID ShowGameOptionsDlg(HWND hwnd)
 {
     DWORD dwOldOptions = dwOptions;
+    RECT rcMain, rcStatus;
+    int nWidth, nHeight, nStatusHeight;
 
     if (DialogBox(hInstance, MAKEINTRESOURCE(IDD_OPTIONS), hwnd, OptionsDlgProc))
     {
         if ((dwOldOptions & OPTION_THREE_CARDS) != (dwOptions &
OPTION_THREE_CARDS))
             NewGame();
+
+        if ((dwOldOptions & OPTION_SHOW_STATUS) != (dwOptions &
OPTION_SHOW_STATUS))
+        {
+            GetClientRect(hwndMain, &rcMain);
+            nHeight = rcMain.bottom - rcMain.top;
+            nWidth = rcMain.right - rcMain.left;
+
+            if (dwOptions & OPTION_SHOW_STATUS)
+            {
+                ShowWindow(hwndStatus, SW_SHOW);
+                GetWindowRect(hwndStatus, &rcStatus);
+                nStatusHeight = rcStatus.bottom - rcStatus.top;
+                MoveWindow(SolWnd, 0, 0, nWidth, nHeight-nStatusHeight, TRUE);
+                MoveWindow(hwndStatus, 0, nHeight-nStatusHeight, nWidth, nHeight, TRUE);
+            }
+            else
+            {
+                ShowWindow(hwndStatus, SW_HIDE);
+                MoveWindow(SolWnd, 0, 0, nWidth, nHeight, TRUE);
+            }
+        }
     }
 }
 
@@ -413,9 +444,10 @@
 LRESULT CALLBACK WndProc (HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
 {
     static int nWidth, nHeight;
-    int nStatusHeight = 0;//20;
     int parts[] = { 100, -1 };
     int ret;
+    RECT rc;
+    int nStatusHeight = 0;
 
     MINMAXINFO *mmi;
 
@@ -428,8 +460,6 @@
 
         SendMessage(hwndStatus, SB_SETPARTS, 2, (LPARAM)parts); 
         SendMessage(hwndStatus, SB_SETTEXT, 0 | SBT_NOBORDERS, (LPARAM)"");
-
-        ShowWindow(hwndStatus, SW_HIDE);
 
         SolWnd.Create(hwnd, WS_EX_CLIENTEDGE, WS_CHILD|WS_VISIBLE, 0, 0, 0, 0);
 
@@ -449,8 +479,17 @@
         nWidth  = LOWORD(lParam);
         nHeight = HIWORD(lParam);
 
-        MoveWindow(SolWnd, 0, 0, nWidth, nHeight-nStatusHeight, TRUE);
-        //MoveWindow(hwndStatus, 0, nHeight-nStatusHeight, nWidth, nHeight, TRUE);
+        if (dwOptions & OPTION_SHOW_STATUS)
+        {
+            GetWindowRect(hwndStatus, &rc);
+            nStatusHeight = rc.bottom - rc.top;
+            MoveWindow(SolWnd, 0, 0, nWidth, nHeight-nStatusHeight, TRUE);
+            MoveWindow(hwndStatus, 0, nHeight-nStatusHeight, nWidth, nHeight, TRUE);
+        }
+        else
+        {
+            MoveWindow(SolWnd, 0, 0, nWidth, nHeight, TRUE);
+        }
         //parts[0] = nWidth - 256;
         //SendMessage(hwndStatus, SB_SETPARTS, 2, (LPARAM)parts); 
         return 0;

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 (original)
+++ trunk/reactos/base/applications/games/solitaire/solitaire.h Sun Aug  5 22:56:39 2007
@@ -5,6 +5,7 @@
 extern TCHAR szAppName[];
 extern bool fGameStarted;
 
+#define OPTION_SHOW_STATUS   4
 #define OPTION_THREE_CARDS   8
 #define CARDBACK_START IDC_CARDBACK1
 #define CARDBACK_END IDC_CARDBACK4