Changeset 2421 for trunk/src/user32/new/pmframe.cpp

Timestamp:

Jan 12, 2000, 6:37:29 PM (26 years ago)

Author:

cbratschi

Message:

fixed WM_CALCVALIDRECTS, added region for WM_NCPAINT

File:

• trunk/src/user32/new/pmframe.cpp (modified) (9 diffs)

trunk/src/user32/new/pmframe.cpp

@@ -1 @@
-/* $Id: pmframe.cpp,v 1.12 2000-01-12 15:14:16 sandervl Exp $ */
+/* $Id: pmframe.cpp,v 1.13 2000-01-12 17:37:29 cbratschi Exp $ */
 /*
  * Win32 Frame Managment Code for OS/2
@@ -107 +107 @@
   {
     case WM_FORMATFRAME:
-        break;
+        break;
 
     case WM_MINMAXFRAME:
@@ -118 +118 @@
       {
         win32wnd->setStyle((win32wnd->getStyle() & ~WS_MINIMIZE_W) | WS_MAXIMIZE_W);
-      } 
+      }
       else if ((swp->fl & SWP_MINIMIZE) == SWP_MINIMIZE)
       {
         win32wnd->setStyle((win32wnd->getStyle() & ~WS_MAXIMIZE_W) | WS_MINIMIZE_W);
-      } 
+      }
       else if ((swp->fl & SWP_RESTORE) == SWP_RESTORE)
       {
@@ -262 +262 @@
 
         if ((pswp->fl & (SWP_SIZE | SWP_MOVE | SWP_ZORDER)) == 0)
-        {
-                swpClient.hwnd = win32wnd->getOS2WindowHandle();
-                swpClient.hwndInsertBehind = 0;
-                swpClient.x  = 0;
-                swpClient.y  = 0;
-                swpClient.cx = 0;
-                swpClient.cy = 0;
-                swpClient.fl = pswp->fl & ~SWP_ZORDER;
-                WinSetMultWindowPos(thdb->hab, &swpClient, 1);
-                goto PosChangedEnd;
-        }
+        {
+                swpClient.hwnd = win32wnd->getOS2WindowHandle();
+                swpClient.hwndInsertBehind = 0;
+                swpClient.x  = 0;
+                swpClient.y  = 0;
+                swpClient.cx = 0;
+                swpClient.cy = 0;
+                swpClient.fl = pswp->fl & ~SWP_ZORDER;
+                WinSetMultWindowPos(thdb->hab, &swpClient, 1);
+                goto PosChangedEnd;
+        }
 
         if(pswp->fl & (SWP_MOVE | SWP_SIZE)) {
@@ -285 +285 @@
 
         if(pswp->fl & (SWP_MOVE | SWP_SIZE)) {
-                win32wnd->setWindowRect(wp.x, wp.y, wp.x+wp.cx, wp.y+wp.cy);
-
-                win32wnd->MsgFormatFrame();
-                //CB: todo: use result for WM_CALCVALIDRECTS
-                mapWin32ToOS2Rect(WinQueryWindow(hwnd,QW_PARENT),hwnd,win32wnd->getClientRectPtr(),(PRECTLOS2)&rect);
-
-                swpClient.hwnd = win32wnd->getOS2WindowHandle();
-                swpClient.hwndInsertBehind = 0;
-                swpClient.x  = rect.xLeft;
-                swpClient.y  = rect.yBottom;
-                swpClient.cx = rect.xRight-rect.xLeft;
-                swpClient.cy = rect.yTop-rect.yBottom;
-                //TODO: Get rid of SWP_SHOW; needed for winhlp32 button bar for now
-                swpClient.fl = (pswp->fl & ~SWP_ZORDER) | SWP_MOVE | SWP_SHOW;
-                WinSetMultWindowPos(thdb->hab, &swpClient, 1);
-        }
+                win32wnd->setWindowRect(wp.x, wp.y, wp.x+wp.cx, wp.y+wp.cy);
+
+                win32wnd->MsgFormatFrame();
+                //CB: todo: use result for WM_CALCVALIDRECTS
+                mapWin32ToOS2Rect(WinQueryWindow(hwnd,QW_PARENT),hwnd,win32wnd->getClientRectPtr(),(PRECTLOS2)&rect);
+
+                swpClient.hwnd = win32wnd->getOS2WindowHandle();
+                swpClient.hwndInsertBehind = 0;
+                swpClient.x  = rect.xLeft;
+                swpClient.y  = rect.yBottom;
+                swpClient.cx = rect.xRight-rect.xLeft;
+                swpClient.cy = rect.yTop-rect.yBottom;
+                //TODO: Get rid of SWP_SHOW; needed for winhlp32 button bar for now
+                swpClient.fl = (pswp->fl & ~SWP_ZORDER) | SWP_MOVE | SWP_SHOW;
+                WinSetMultWindowPos(thdb->hab, &swpClient, 1);
+        }
 
         if(win32wnd->CanReceiveSizeMsgs())
@@ -307 +307 @@
         //update child positions: rectWindow is in window coordinates
         if(pswp->fl & (SWP_MOVE | SWP_SIZE)) {
-                FrameUpdateChildPositions(win32wnd->getOS2WindowHandle());
-        }
+                FrameUpdateChildPositions(win32wnd->getOS2WindowHandle());
+        }
 
 PosChangedEnd:
@@ -317 +317 @@
     case WM_CALCVALIDRECTS:
     {
-      PRECTL oldRect = (PRECTL)mp1,newRect = oldRect+1;
-      UINT res = 0; //= CVR_ALIGNLEFT | CVR_ALIGNTOP;
-
-//CB: todo: use WM_NCCALCSIZE result
-      if (win32wnd->getWindowClass())
-      {
-        DWORD dwStyle = win32wnd->getWindowClass()->getClassLongA(GCL_STYLE_W);
-
-        if ((dwStyle & CS_HREDRAW_W) && (newRect->xRight-newRect->xLeft != oldRect->xRight-oldRect->xLeft))
-          res |= CVR_REDRAW;
-        else if ((dwStyle & CS_VREDRAW_W) && (newRect->yTop-newRect->yBottom != oldRect->yTop-oldRect->yBottom))
-          res |= CVR_REDRAW;
-      } else res |= CVR_REDRAW;
-
-      //CB: PM sets client window position
-//      RestoreOS2TIB();
-//      OldFrameProc(hwnd,msg,mp1,mp2);
-//      SetWin32TIB();
-
       RestoreOS2TIB();
-      return (MRESULT)res;
+      return (MRESULT)CVR_REDRAW; //always redraw frame
     }
 
@@ -357 +338 @@
             if (topOwner) WinSetWindowPos(topOwner->getOS2FrameWindowHandle(),hwnd,0,0,0,0,SWP_ZORDER);
           }
-        } 
+        }
         else
         {
@@ -404 +385 @@
   SWP swpClient = {0};
 
-        win32wnd->MsgFormatFrame();
-        //CB: todo: use result for WM_CALCVALIDRECTS
-        mapWin32ToOS2Rect(WinQueryWindow(win32wnd->getOS2FrameWindowHandle(),QW_PARENT),win32wnd->getOS2FrameWindowHandle(),win32wnd->getClientRectPtr(),(PRECTLOS2)&rect);
-
-        swpClient.hwnd = win32wnd->getOS2WindowHandle();
-        swpClient.hwndInsertBehind = 0;
-        swpClient.x  = rect.xLeft;
-        swpClient.y  = rect.yBottom;
-        swpClient.cx = rect.xRight-rect.xLeft;
-        swpClient.cy = rect.yTop-rect.yBottom;
-        swpClient.fl = SWP_MOVE | SWP_SIZE;
-        WinSetMultWindowPos(GetThreadHAB(), &swpClient, 1);
+        win32wnd->MsgFormatFrame();
+        //CB: todo: use result for WM_CALCVALIDRECTS
+        mapWin32ToOS2Rect(WinQueryWindow(win32wnd->getOS2FrameWindowHandle(),QW_PARENT),win32wnd->getOS2FrameWindowHandle(),win32wnd->getClientRectPtr(),(PRECTLOS2)&rect);
+
+        swpClient.hwnd = win32wnd->getOS2WindowHandle();
+        swpClient.hwndInsertBehind = 0;
+        swpClient.x  = rect.xLeft;
+        swpClient.y  = rect.yBottom;
+        swpClient.cx = rect.xRight-rect.xLeft;
+        swpClient.cy = rect.yTop-rect.yBottom;
+        swpClient.fl = SWP_MOVE | SWP_SIZE;
+        WinSetMultWindowPos(GetThreadHAB(), &swpClient, 1);
 }
 //******************************************************************************