Changeset 1033 for trunk/dll

Timestamp:

Jun 30, 2008, 3:39:39 PM (17 years ago)

Author:

John Small

Message:

Ticket 103: Fix the restore the the previous shutdown state when reopening FM/2.

File:

• trunk/dll/mainwnd.c (modified) (10 diffs)

trunk/dll/mainwnd.c

@@ -57 +57 @@
   19 Jun 08 JBS Ticket 227: Allow temporary saving/deleting of the shutdown state of directory containers
   22 Jun 08 GKY Use free_... functions for fortify checking
+  30 Jun 08 JBS Ticket 103: Fix restore of previous shutdown state when opening FM/2
 
 ***********************************************************************/
@@ -188 +189 @@
       fNoTileUpdate = FALSE;
       //xfree((char *)mp1, pszSrcFile, __LINE__);
-      if (fAutoTile)
-        TileChildren(hwndMain, TRUE);
+//       if (fAutoTile)
+//         TileChildren(hwndMain, TRUE);
       break;
     default:
@@ -2824 +2825 @@
           if (*szDir) {
            // If saving shutdown state skip no prescan drives
-           if (fIsShutDownState &&
-               driveflags[toupper(*szDir) - 'A'] & DRIVE_NOPRESCAN) {
-             continue;
-           }
+            if (fIsShutDownState &&
+                driveflags[toupper(*szDir) - 'A'] & DRIVE_NOPRESCAN) {
+              continue;
+            }
             sprintf(szKey, "%sDirCnrPos.%lu", szPrefix, numsaves);
             PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & swp,
@@ -2974 +2975 @@
   CHAR szDir[CCHMAXPATH];
   CHAR szPrefix[STATE_NAME_MAX_BYTES + 2];
-  HWND hwndDir, hwndC, hwndDir0 = NULLHANDLE, hwndPPSave = NULLHANDLE;
+  HWND hwndDir, hwndC, hwndPPSave = NULLHANDLE;
   SWP swp, swpO, swpN;
-  ULONG size, numsaves = 0, x;
+  ULONG size, numsaves = 0;
+  LONG x;
   double xtrans, ytrans;
   BOOL fRestored = FALSE;
@@ -3055 +3057 @@
     if (fDeleteState)
       PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
-    for (x = 0; x < numsaves; x++) {
+    for (x = numsaves - 1; x >= 0; x--) {
       sprintf(szKey, "%sDirCnrPos.%lu", szPrefix, x);
       size = sizeof(SWP);
@@ -3232 +3234 @@
                                       MPFROMP(szDir), MPFROMLONG(1));
           if (hwndDir) {
-
-            if (x == 0) {
-              hwndDir0 = hwndDir;
-            }
             hwndC = WinWindowFromID(hwndDir, FID_CLIENT);
             if (hwndC) {
@@ -3330 +3328 @@
             swp.hwnd = hwndDir;
             TransformSwp(&swp, xtrans, ytrans);
-            if (!fAutoTile && !(swp.fl & (SWP_HIDE | SWP_MINIMIZE)))
+            if (swp.fl & (SWP_HIDE | SWP_MINIMIZE)) {
+              WinSetWindowPos(hwndDir,
+                              HWND_TOP, 0, 0, 0, 0, SWP_MINIMIZE | SWP_SHOW);
+              WinSetWindowUShort(hwndDir, QWS_XRESTORE, (USHORT) swp.x);
+              WinSetWindowUShort(hwndDir, QWS_CXRESTORE, (USHORT) swp.cx);
+              WinSetWindowUShort(hwndDir, QWS_YRESTORE, (USHORT) swp.y);
+              WinSetWindowUShort(hwndDir, QWS_CYRESTORE, (USHORT) swp.cy);
+            } else
               WinSetWindowPos(hwndDir,
                               HWND_TOP,
@@ -3340 +3345 @@
                               SWP_SIZE | SWP_SHOW |  SWP_ZORDER |
                               SWP_ACTIVATE);
-            else if (swp.fl & (SWP_HIDE | SWP_MINIMIZE)) {
-              WinSetWindowPos(hwndDir,
-                              HWND_TOP, 0, 0, 0, 0, SWP_MINIMIZE | SWP_SHOW);
-              WinSetWindowUShort(hwndDir, QWS_XRESTORE, (USHORT) swp.x);
-              WinSetWindowUShort(hwndDir, QWS_CXRESTORE, (USHORT) swp.cx);
-              WinSetWindowUShort(hwndDir, QWS_YRESTORE, (USHORT) swp.y);
-              WinSetWindowUShort(hwndDir, QWS_CYRESTORE, (USHORT) swp.cy);
-            }
-            else
-              WinSetWindowPos(hwndDir,
-                              HWND_BOTTOM,
-                              0, 0, 0, 0, SWP_ZORDER | SWP_ACTIVATE);
           }
         }
@@ -3359 +3352 @@
        SavePresParams(hwndPPSave, "DirCnr");
        WinDestroyWindow(hwndPPSave);
-    }
-    if (hwndDir0) {
-      WinSetFocus(HWND_DESKTOP, hwndDir0);
     }
   }
@@ -5755 +5745 @@
 
   case UM_SETUP5:
-    if (fAutoTile)
-      TileChildren(hwnd, TRUE);
+//     if (fAutoTile)
+//       TileChildren(hwnd, TRUE);
     PostMsg(hwnd, UM_FILLUSERLIST, MPVOID, MPVOID);
     PostMsg(hwnd, UM_FILLSETUPLIST, MPVOID, MPVOID);