Changeset 2433 for trunk/src/user32/new/win32wbasenonclient.cpp

Timestamp:

Jan 13, 2000, 9:11:39 PM (26 years ago)

Author:

sandervl

Message:

Client rectangle changes, GetDCEx bugfix (CS_OWNDC), scroll rectangle calculation fixes

File:

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

trunk/src/user32/new/win32wbasenonclient.cpp

@@ -1 @@
-/* $Id: win32wbasenonclient.cpp,v 1.4 2000-01-13 13:54:54 sandervl Exp $ */
+/* $Id: win32wbasenonclient.cpp,v 1.5 2000-01-13 20:11:39 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2 (non-client methods)
@@ -357 +357 @@
   UINT style;
 
-  if (!calcValidRects) return 0;
-
-  style = (UINT) GetClassLongA(Win32Hwnd,GCL_STYLE);
-
-  if (style & CS_VREDRAW) result |= WVR_VREDRAW;
-  if (style & CS_HREDRAW) result |= WVR_HREDRAW;
-
-  clientRect = &((NCCALCSIZE_PARAMS*)winRect)->rgrc[2];
-  *clientRect = rectWindow;
-  if (getParent()) mapWin32Rect(OSLIB_HWND_DESKTOP,getParent()->getOS2WindowHandle(),clientRect);
-
-  if(!(dwStyle & WS_MINIMIZE))
-  {
-    AdjustRectOuter(&tmpRect,FALSE);
-
-    clientRect->left   -= tmpRect.left;
-    clientRect->top    -= tmpRect.top;
-    clientRect->right  -= tmpRect.right;
-    clientRect->bottom -= tmpRect.bottom;
-
-    if (HAS_MENU())
-    {
-      clientRect->top +=
+    if (!calcValidRects) return 0;
+
+    style = (UINT) GetClassLongA(Win32Hwnd,GCL_STYLE);
+
+    if (style & CS_VREDRAW) result |= WVR_VREDRAW;
+    if (style & CS_HREDRAW) result |= WVR_HREDRAW;
+
+    clientRect = &((NCCALCSIZE_PARAMS*)winRect)->rgrc[2];
+    *clientRect = rectWindow;
+#if 1
+    OffsetRect(clientRect, -clientRect->left, -clientRect->top);
+#else
+    if(getParent()) {//in parent coordinates
+        OffsetRect(clientRect, -clientRect->left, -clientRect->top);
+        MapWindowPoints(getWindowHandle(), getParent()->getWindowHandle(), (POINT *)clientRect, 2);
+    }
+    //else in screen coordinates (already in screen coordinates)
+#endif
+
+    if(!(dwStyle & WS_MINIMIZE))
+    {
+        AdjustRectOuter(&tmpRect,FALSE);
+
+        clientRect->left   -= tmpRect.left;
+        clientRect->top    -= tmpRect.top;
+        clientRect->right  -= tmpRect.right;
+        clientRect->bottom -= tmpRect.bottom;
+
+        if (HAS_MENU())
+        {
+            clientRect->top +=
                 MENU_GetMenuBarHeight(Win32Hwnd,
                                        winRect->right - winRect->left,
                                        -tmpRect.left, -tmpRect.top ) + 1;
-    }
-
-    SetRect (&tmpRect, 0, 0, 0, 0);
-    AdjustRectInner(&tmpRect);
-    clientRect->left   -= tmpRect.left;
-    clientRect->top    -= tmpRect.top;
-    clientRect->right  -= tmpRect.right;
-    clientRect->bottom -= tmpRect.bottom;
-  }
-
-  return result;
+        }
+
+        SetRect (&tmpRect, 0, 0, 0, 0);
+        AdjustRectInner(&tmpRect);
+        clientRect->left   -= tmpRect.left;
+        clientRect->top    -= tmpRect.top;
+        clientRect->right  -= tmpRect.right;
+        clientRect->bottom -= tmpRect.bottom;
+    }
+
+    return result;
 }
 //******************************************************************************