Changeset 954

Timestamp:

Feb 16, 2008, 4:58:43 AM (17 years ago)

Author:

Steven Levine

Message:

Rework ResizeChildren to resize drive tree correctly
Avoid trap in TreeCnrWndProc WM_SAVEAPPLICATION

Location:

trunk

Files:

• HISTORY (modified) (3 diffs)
• dll/mainwnd.c (modified) (2 diffs)
• dll/treecnr.c (modified) (2 diffs)

trunk/HISTORY

@@ -4 +4 @@
  o Removed the close buttton and menu item from the tree container which closed FM/2 (Gregg)
  o Implement bubble help for bitmap menu items in collector and arc container (Gregg)
- o Correct/enhance settings notebook navigation, ticket #188  (Steven)
+ o Correct/enhance settings notebook navigation, ticket #188 (Steven)
  o Reopen settings notebook to last selected page unless overridden, ticket #188 (Steven)
  o Correct Compare Directories select count regression (Steven)
@@ -26 +26 @@
    This reverts to orginal behavior for named states
  o Rework collector progress reporting and improve performance (ticket #79)
- o Compile OpenWatcom version into binary
- o Add conditional cascade to main menu settings menu item
+ o Compile OpenWatcom version into binary (Steven)
+ o Add conditional cascade to main menu settings menu item (Steven)
+ o Rework ResizeChildren to resize drive tree correctly (Steven)
+ o Avoid trap in TreeCnrWndProc WM_SAVEAPPLICATION (Steven)
 
 3.09
@@ -43 +45 @@
  o Internal editor now handles readonly files (Gregg)
  o Correct hex edit buffer sizing to avoid data loss (Steven)
- o Use CopyPresParams to fix presparam inconsistencies in menus  (Gregg)
+ o Use CopyPresParams to fix presparam inconsistencies in menus (Gregg)
  o Correct variable cast to fix hex code display problem (Gregg)
  o Correct variable cast to fix hex code display problem (Gregg)

trunk/dll/mainwnd.c

@@ -51 +51 @@
   05 Feb 08 SHL Restore no-prescan drives if restoring named state
   14 Feb 08 SHL Rework to support settings menu conditional cascade
+  15 Feb 08 SHL Rework ResizeChildren to honor fNoTreeGap and resize drive tree better
 
 ***********************************************************************/
@@ -3662 +3663 @@
     WinQueryWindowPos(hwndTree, &swp);
     if (!(swp.fl & (SWP_MAXIMIZE | SWP_HIDE | SWP_MINIMIZE))) {
-      if (swp.y + swp.cy < Rectl.yTop - Rectl.yBottom)
-        swp.cy = (Rectl.yTop - Rectl.yBottom) - swp.y;
+
+      if (!fNoTreeGap) {
+        INT height = WinQuerySysValue(HWND_DESKTOP, SV_CYICON) * 2;
+        if (swp.y < height)
+          swp.y = height;       // Force bottom to position
+      }
+      else
+        swp.y = 0;              // Force bottom to position
+
+      swp.cy = (Rectl.yTop - Rectl.yBottom) - swp.y;
+      if (swp.cy < 0)
+        swp.cy = 0;
+
       if (swp.x != 0)
-        swp.x = 0;
-      if (swp.y < 0)
-        swp.y = 0;
-      if (swp.x + swp.cx > abs(Rectl.xRight - Rectl.xLeft))
-        swp.cx = abs(Rectl.xRight - Rectl.xLeft);
+        swp.x = 0;              // Left align
+
+      // AdjustSizeOfClient can return bogus xRight values - fixme someday
+      if (Rectl.xRight >= Rectl.xLeft) {
+        if (swp.x + swp.cx > Rectl.xRight - Rectl.xLeft)
+          swp.cx = Rectl.xRight - Rectl.xLeft;
+      }
       WinSetWindowPos(hwndTree, HWND_TOP, swp.x, swp.y, swp.cx, swp.cy,
                       SWP_MOVE | SWP_SIZE | SWP_SHOW | SWP_RESTORE);

trunk/dll/treecnr.c

@@ -45 +45 @@
   10 Jan 08 SHL Sync with CfgDlgProc mods
   15 Feb 08 SHL Sync with settings menu rework
+  15 Feb 08 SHL Avoid death if tree container 0 width
 
 ***********************************************************************/
@@ -2828 +2829 @@
       if (!(swp.fl & (SWP_MINIMIZE | SWP_MAXIMIZE | SWP_HIDE))) {
         WinQueryWindowPos(dcd->hwndParent, &swpP);
-        ratio = (swpP.cx * 100) / swp.cx;
-        if (ratio > 0)
-          PrfWriteProfileData(fmprof, appname, "TreeWindowRatio",
-                              &ratio, sizeof(INT));
+        if (swp.cx) {
+          ratio = (swpP.cx * 100) / swp.cx;
+          if (ratio > 0)
+            PrfWriteProfileData(fmprof, appname, "TreeWindowRatio",
+                                &ratio, sizeof(INT));
+        }
       }
     }