Changeset 4460 for trunk/src

Timestamp:

Oct 8, 2000, 10:05:29 PM (25 years ago)

Author:

sandervl

Message:

AdjustWindowRectEx fix for scrollbars

File:

• trunk/src/user32/window.cpp (modified) (2 diffs)

trunk/src/user32/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.78 2000-10-08 18:45:36 sandervl Exp $ */
+/* $Id: window.cpp,v 1.79 2000-10-08 20:05:29 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -948 +948 @@
 
     //Adjust rect inner (Win32BaseWindow::AdjustRectInner)
-    if (exStyle & WS_EX_CLIENTEDGE)
-      InflateRect (rect, GetSystemMetrics(SM_CXEDGE), GetSystemMetrics(SM_CYEDGE));
-
-    if (exStyle & WS_EX_STATICEDGE)
-      InflateRect (rect, GetSystemMetrics(SM_CXBORDER), GetSystemMetrics(SM_CYBORDER));
-
-    if (style & WS_VSCROLL) rect->right  += GetSystemMetrics(SM_CXVSCROLL);
-    if (style & WS_HSCROLL) rect->bottom += GetSystemMetrics(SM_CYHSCROLL);
+    if(!(style & WS_ICONIC)) {
+        if (exStyle & WS_EX_CLIENTEDGE)
+                InflateRect (rect, GetSystemMetrics(SM_CXEDGE), GetSystemMetrics(SM_CYEDGE));
+
+        if (exStyle & WS_EX_STATICEDGE)
+                InflateRect (rect, GetSystemMetrics(SM_CXBORDER), GetSystemMetrics(SM_CYBORDER));
+
+        //SvL: scrollbars aren't checked *UNLESS* the style includes a border (any border)
+        //     --> VERIFIED IN NT4, SP6 (fixes MFC apps with scrollbars + bar controls)
+        if(style & (WS_THICKFRAME|WS_BORDER|WS_DLGFRAME)) {
+                if (style & WS_VSCROLL) rect->right  += GetSystemMetrics(SM_CXVSCROLL);
+                if (style & WS_HSCROLL) rect->bottom += GetSystemMetrics(SM_CYHSCROLL);
+        }
+    }
 
     dprintf(("AdjustWindowRectEx returned (%d,%d)(%d,%d)\n", rect->left, rect->top, rect->right, rect->bottom));