Changeset 1172 for trunk/src

Timestamp:

Oct 7, 1999, 9:38:27 PM (26 years ago)

Author:

sandervl

Message:

Winhlp32 resize bugfix

File:

• trunk/src/user32/pmwindow.cpp (modified) (7 diffs)

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.19 1999-10-07 18:24:53 achimha Exp $ */
+/* $Id: pmwindow.cpp,v 1.20 1999-10-07 19:38:27 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -271 +271 @@
       HWND      hParent = NULLHANDLE, hFrame = NULLHANDLE;
       LONG      yDelta = pswp->cy - pswpo->cy;
+      LONG      xDelta = pswp->cx - pswpo->cx;
       ULONG     classStyle;
 
@@ -296 +297 @@
         classStyle = win32wnd->getClass()->getStyle();
 
-        if ((yDelta != 0) || (pswp->cx != pswpo->cx)) 
+        if (yDelta != 0 || xDelta != 0)
         {
             HENUM henum = WinBeginEnumWindows(pswp->hwnd);
@@ -306 +307 @@
             {
 #if 0
-               if (mdiClient )
-               {
+                if (mdiClient )
+                {
                   continue;
-               }
+                }
 #endif
-               WinQueryWindowPos(hwnd, &(swp[i]));
-               swp[i].y += yDelta;
-
-               if (i == 9)
-               {
-                  WinSetMultWindowPos(GetThreadHAB(), swp, 10);
-                  i = 0;
-               }
-               else
-               {
-                  i++;
-               }
+                WinQueryWindowPos(hwnd, &(swp[i]));
+
+#ifdef DEBUG
+                Win32BaseWindow *window = Win32BaseWindow::GetWindowFromOS2Handle(hwnd);
+                dprintf(("ENUMERATE %x delta %d (%d,%d) (%d,%d)", (window) ? window->getWindowHandle() : hwnd,
+                         yDelta, swp[i].x, swp[i].y, swp[i].cx, swp[i].cy));
+#endif
+
+                swp[i].cy += yDelta;
+                swp[i].fl  = SWP_SIZE;
+
+                if (i == 9)
+                {
+                    WinSetMultWindowPos(GetThreadHAB(), swp, 10);
+                    i = 0;
+                }
+                else
+                {
+                    i++;
+                }
             }
 
@@ -333 +342 @@
         {
             POINT pt;
+#if 1
+            if(GetCaretPos (&pt) == TRUE)
+            {
+                pt.y -= yDelta;
+                SetCaretPos (pt.x, pt.y);
+            }
+#else
             GetCaretPos (&pt);
             pt.y -= yDelta;
             SetCaretPos (pt.x, pt.y);
+#endif
         }
         win32wnd->MsgPosChanged((LPARAM)&wp);
@@ -372 +389 @@
 
         OSLibMapSWPtoWINDOWPOS(&swp, &wp, &swpo, NULLHANDLE, hFrame);
+
+        dprintf(("OS2: WM_MOVE %x %x (%d,%d) (%d,%d)", hwnd, swp.fl, swp.x, swp.y, swp.cx, swp.cy));
 
         wp.flags &= ~SWP_NOMOVE_W;
@@ -776 +795 @@
      PSZ   wintext;
 
-        if(wndpars->fsStatus & (WPM_CCHTEXT | WPM_TEXT)) 
+        if(wndpars->fsStatus & (WPM_CCHTEXT | WPM_TEXT))
         {
             if(wndpars->fsStatus & WPM_CCHTEXT)