Changeset 1762 for trunk/src/user32/scroll.cpp

Timestamp:

Nov 17, 1999, 6:06:23 PM (26 years ago)

Author:

cbratschi

Message:

cursor handling fixed

File:

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

trunk/src/user32/scroll.cpp

@@ -1 @@
-/* $Id: scroll.cpp,v 1.22 1999-11-13 16:42:42 cbratschi Exp $ */
+/* $Id: scroll.cpp,v 1.23 1999-11-17 17:04:54 cbratschi Exp $ */
 /*
  * Scrollbar control
@@ -713 +713 @@
     HDC hdc;
     POINT pt;
-    LRESULT res = (msg == WM_MOUSEMOVE) ? 1:0;
+    LRESULT res = 0;
 
     SCROLLBAR_INFO *infoPtr = SCROLL_GetInfoPtr(hwnd,nBar);
@@ -726 +726 @@
         if (!(dwStyle & SBS_SIZEGRIP)) return res;
 
-        if (msg == WM_MOUSEMOVE)
+        if (msg == WM_SETCURSOR)
         {
           RECT rect;
 
           SCROLL_GetSizeBox(hwnd,dwStyle,&rect);
-          pt.x = (SHORT)LOWORD(lParam);
-          pt.y = (SHORT)HIWORD(lParam);
+          GetCursorPos(&pt);
+          ScreenToClient(hwnd,&pt);
 
           if (PtInRect(&rect,pt))
           {
             SetCursor(LoadCursorA(0,IDC_SIZENWSEA));
-            return 0;
+            return TRUE;
           }
+
+          return DefWindowProcA(hwnd,WM_SETCURSOR,wParam,lParam);
         } else if (msg == WM_LBUTTONDOWN)
         {
@@ -766 +768 @@
     }
 
+    if (msg == WM_SETCURSOR) return DefWindowProcA(hwnd,WM_SETCURSOR,wParam,lParam);
     if (!SCROLL_Scrolling && msg != WM_LBUTTONDOWN) return res;
 
@@ -1126 +1129 @@
     case WM_CAPTURECHANGED:
     case WM_MOUSEMOVE:
+    case WM_SETCURSOR:
     case WM_SYSTIMER:
     case WM_SETFOCUS:
@@ -1203 +1207 @@
     case WM_CAPTURECHANGED:
     case WM_MOUSEMOVE:
+    case WM_SETCURSOR:
     case WM_SYSTIMER:
     case WM_SETFOCUS:
@@ -1257 +1262 @@
     case WM_CAPTURECHANGED:
     case WM_MOUSEMOVE:
+    case WM_SETCURSOR:
     case WM_SYSTIMER:
     case WM_SETFOCUS:
@@ -1542 +1548 @@
 }
 
-// CB: functions to get 32bit SB_THUMBTRACK position, for internal use
+// CB: functions to get 32bit SB_THUMBTRACK position, for internal use (controls)
+//     not supported by Windows, Windows only delivers the 16bit value
 
 BOOL IsScrollBarTracking(HWND hwnd,INT nBar)
@@ -1551 +1558 @@
 }
 
-INT GetScrollTrackPos(HWND hwnd,INT nBar)
+INT WINAPI GetScrollTrackPos(HWND hwnd,INT nBar)
 {
   SCROLLBAR_INFO *infoPtr;