Changeset 1342 for trunk/src

Timestamp:

Oct 17, 1999, 8:09:22 PM (26 years ago)

Author:

sandervl

Message:

scrollbar fixes

Location:

trunk/src/user32

Files:

• pmwindow.cpp (modified) (3 diffs)
• scroll.cpp (modified) (3 diffs)

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.34 1999-10-17 15:46:08 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.35 1999-10-17 18:09:22 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -605 +605 @@
         //OS/2 Window coordinates -> Win32 Window coordinates
         if(win32wnd->MsgMouseMove(keystate, SHORT1FROMMP(mp1), MapOS2ToWin32Y(win32wnd, SHORT2FROMMP(mp1))))
-    {
-        //Changes mouse cursor to default
-            goto RunDefWndProc;
-    }
+        {
+                //Changes mouse cursor to default
+                goto RunDefWndProc;
+        }
         break;
     }
@@ -949 +949 @@
 
         OSLibMapSWPtoWINDOWPOS(pswp,&wp,pswpo,hParent,hFrame);
+
+        SWP swpFrame;
+        WinQueryWindowPos(WinQueryWindow(hwnd, QW_PARENT), &swpFrame);
+        POINTL point;
+
+        point.x = swpFrame.x;
+        point.y = swpFrame.y;
+        WinMapWindowPoints(WinQueryWindow(hwnd, QW_PARENT), HWND_DESKTOP,
+                           &point, 1);
+        point.y = OSLibQueryScreenHeight() - point.y - swpFrame.cy;
+
+        win32wnd->setWindowRect(point.x, point.y, point.x+swpFrame.cx, point.y+swpFrame.cy);
+        win32wnd->setClientRect(pswpo->x, pswpo->y, pswpo->x + pswpo->cx, pswpo->y + pswpo->cy);
+
         win32wnd->MsgPosChanged((LPARAM)&wp);
 

trunk/src/user32/scroll.cpp

@@ -1 @@
-/* $Id: scroll.cpp,v 1.9 1999-10-17 12:17:44 cbratschi Exp $ */
+/* $Id: scroll.cpp,v 1.10 1999-10-17 18:09:22 sandervl Exp $ */
 /*
  * Scrollbar control
@@ -1133 +1133 @@
             CONV_POINT16TO32( (POINT16 *)&lParam, &pt );
             SCROLL_HandleScrollEvent( hwnd, SB_HORZ, message, pt );
+            if(message == WM_MOUSEMOVE) {
+                return 1; //SvL: Let PM change the mouse cursor to the default
+            }
         }
         break;
@@ -1208 +1211 @@
             CONV_POINT16TO32( (POINT16 *)&lParam, &pt );
             SCROLL_HandleScrollEvent( hwnd, SB_VERT, message, pt );
+            if(message == WM_MOUSEMOVE) {
+                return 1; //SvL: Let PM change the mouse cursor to the default
+            }
         }
         break;