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

Timestamp:

Dec 26, 1999, 6:30:20 PM (26 years ago)

Author:

cbratschi

Message:

non-client fixes, DefWndProc enhancements, several other bugs fixed

File:

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

trunk/src/user32/scroll.cpp

@@ -1 @@
-/* $Id: scroll.cpp,v 1.28 1999-12-16 16:53:57 cbratschi Exp $ */
+/* $Id: scroll.cpp,v 1.29 1999-12-26 17:30:17 cbratschi Exp $ */
 /*
  * Scrollbar control
@@ -732 +732 @@
         if (!(dwStyle & SBS_SIZEGRIP)) return res;
 
-        if (msg == WM_SETCURSOR)
-        {
-          RECT rect;
-
-          SCROLL_GetSizeBox(hwnd,dwStyle,&rect);
-          GetCursorPos(&pt);
-          ScreenToClient(hwnd,&pt);
-
-          if (PtInRect(&rect,pt))
-          {
-            SetCursor(LoadCursorA(0,IDC_SIZENWSEA));
-            return TRUE;
-          }
-
-          return DefWindowProcA(hwnd,WM_SETCURSOR,wParam,lParam);
-        } else if (msg == WM_LBUTTONDOWN)
+        if (msg == WM_NCHITTEST)
         {
           if (dwStyle & SBS_SIZEGRIP)
@@ -755 +740 @@
             pt.x = (SHORT)LOWORD(lParam);
             pt.y = (SHORT)HIWORD(lParam);
+            ScreenToClient(hwnd,&pt);
             SCROLL_GetSizeBox(hwnd,dwStyle,&rect);
             if (PtInRect(&rect,pt))
             {
-              HWND hwndFrame;
-
-              Win32BaseWindow *win32wnd = Win32BaseWindow::GetWindowFromHandle(hwnd);
-              if (!win32wnd) return res;
-              hwndFrame = OSLibWinQueryWindow(win32wnd->getOS2WindowHandle(),QWOS_OWNER);
-              win32wnd = Win32BaseWindow::GetWindowFromOS2FrameHandle(hwndFrame);
-              if (!win32wnd) return res;
-              FrameTrackFrame(win32wnd,dwStyle & SBS_SIZEBOXTOPLEFTALIGN);
+              if (dwStyle & SBS_SIZEBOXTOPLEFTALIGN)
+                return HTTOPLEFT;
+              else
+                return HTBOTTOMRIGHT;
             }
           }
+          return DefWindowProcA(hwnd,WM_NCHITTEST,wParam,lParam);
+        } else if (msg == WM_LBUTTONDOWN)
+        {
+          return DefWindowProcA(hwnd,WM_LBUTTONDOWN,wParam,lParam);
         }
 
@@ -774 +760 @@
     }
 
-    if (msg == WM_SETCURSOR) return DefWindowProcA(hwnd,WM_SETCURSOR,wParam,lParam);
-    if (!SCROLL_Scrolling && msg != WM_LBUTTONDOWN) return res;
-
-    vertical = SCROLL_GetScrollBarRect( hwnd, nBar, &rect,
-                                        &arrowSize, &thumbSize, &thumbPos );
+    if (msg == WM_NCHITTEST) return DefWindowProcA(hwnd,WM_NCHITTEST,wParam,lParam);
+
+    vertical = SCROLL_GetScrollBarRect(hwnd,nBar,&rect,&arrowSize,&thumbSize,&thumbPos);
     if (nBar == SB_CTL) hwndOwner = GetParent(hwnd); else
     {
@@ -792 +776 @@
     }
 
-    hwndCtl   = (nBar == SB_CTL) ? hwnd : 0;
+    hwndCtl = (nBar == SB_CTL) ? hwnd:0;
 
     switch (msg)
@@ -800 +784 @@
         pt.y = (SHORT)HIWORD(lParam);
         SCROLL_trackVertical = vertical;
-        SCROLL_trackHitTest = hittest = SCROLL_HitTest( hwnd, nBar, pt, FALSE );
+        SCROLL_trackHitTest = hittest = SCROLL_HitTest(hwnd,nBar,pt,FALSE);
         if (SCROLL_trackHitTest == SCROLL_NOWHERE)
         {
@@ -819 +803 @@
         trackThumbPos = thumbPos;
         prevPt = pt;
-        SetCapture( hwnd );
-        if (nBar == SB_CTL) SetFocus( hwnd );
+        if (nBar == SB_CTL) SetFocus(hwnd);
+        SetCapture(hwnd);
         break;
 
       case WM_MOUSEMOVE:
-        pt.x = (SHORT)LOWORD(lParam);
-        pt.y = (SHORT)HIWORD(lParam);
-        hittest = SCROLL_HitTest( hwnd, nBar, pt, TRUE );
-        prevPt = pt;
+        if (SCROLL_Scrolling)
+        {
+          pt.x = (SHORT)LOWORD(lParam);
+          pt.y = (SHORT)HIWORD(lParam);
+          hittest = SCROLL_HitTest(hwnd,nBar,pt,TRUE);
+          prevPt = pt;
+        } else return res;
         break;
 
@@ -1138 +1125 @@
     case WM_LBUTTONDOWN:
     case WM_LBUTTONUP:
+    case WM_NCHITTEST:
     case WM_CAPTURECHANGED:
     case WM_MOUSEMOVE:
-    case WM_SETCURSOR:
     case WM_SYSTIMER:
     case WM_SETFOCUS:
@@ -1216 +1203 @@
     case WM_LBUTTONDOWN:
     case WM_LBUTTONUP:
+    case WM_NCHITTEST:
     case WM_CAPTURECHANGED:
     case WM_MOUSEMOVE:
-    case WM_SETCURSOR:
     case WM_SYSTIMER:
     case WM_SETFOCUS:
@@ -1271 +1258 @@
     case WM_LBUTTONDOWN:
     case WM_LBUTTONUP:
+    case WM_NCHITTEST:
     case WM_CAPTURECHANGED:
     case WM_MOUSEMOVE:
-    case WM_SETCURSOR:
     case WM_SYSTIMER:
     case WM_SETFOCUS: