Changeset 8377 for trunk/src/user32/listbox.cpp

Timestamp:

May 7, 2002, 3:28:13 PM (23 years ago)

Author:

sandervl

Message:

PF: SetParent mustn't change WS_CHILD; experimental getParent change; listbox/combobox fixes for MFC applications

File:

• trunk/src/user32/listbox.cpp (modified) (4 diffs)

trunk/src/user32/listbox.cpp

@@ -1 @@
-/* $Id: listbox.cpp,v 1.28 2002-04-24 08:56:16 sandervl Exp $ */
+/* $Id: listbox.cpp,v 1.29 2002-05-07 13:28:12 sandervl Exp $ */
 /*
  * Listbox controls
@@ -1771 +1771 @@
 
     if (descr->style & LBS_MULTICOLUMN) return 0;
+    dprintf(("We are handling scroll"));
     switch(LOWORD(wParam))
     {
@@ -2038 +2039 @@
       if (!PtInRect(&screenRect,screenMousePos))
       {
+        dprintf(("Scrollbar hittest - plain branch"));
         ReleaseCapture();
+        LISTBOX_SetCaretIndex( hwnd, pDescr, pDescr->lphc->droppedIndex, FALSE );
         LISTBOX_SetSelection( hwnd, pDescr, pDescr->lphc->droppedIndex, FALSE, FALSE );
 #ifdef __WIN32OS2__
         COMBO_RollupListbox(pDescr->lphc);
  
-       /* @@PF Previous code is all wrong here. Here we are supposed to close
+         /* @@PF Previous code is all wrong here. Here we are supposed to close
          and only close dropdown, instead flip, flips it. This happens because
          previous code did not pay attention to the fact that combobox can be
@@ -2052 +2055 @@
 #endif
         return 0;
-      } else
+      } 
+      else
       {
-        /* Check to see the NC is a scrollbar */
-        INT nHitTestType = SendMessageA(hwnd,WM_NCHITTEST,0,MAKELONG(screenMousePos.x,screenMousePos.y));
-
-        /* Windows sends this message when a scrollbar is clicked
-         */
-        if (nHitTestType != HTCLIENT)
-        {
-          SendMessageA(hwnd,(msg == WM_LBUTTONDOWN) ? WM_NCLBUTTONDOWN:WM_NCLBUTTONDBLCLK,nHitTestType,MAKELONG(screenMousePos.x,screenMousePos.y));
-        }
-
-        /* Resume the Capture after scrolling is complete
-         */
-        if (hWndOldCapture)
-        {
-          SetCapture(hWndOldCapture);
-        }
+            INT nHitTestType=0;
+            LONG style = GetWindowLongA( hwnd, GWL_STYLE );
+            /* Check Vertical scroll bar */
+            if (style & WS_VSCROLL)
+            {
+                clientRect.right += GetSystemMetrics(SM_CXVSCROLL);
+                if (PtInRect( &clientRect, mousePos ))
+                {
+                    nHitTestType = HTVSCROLL;
+                }
+            }
+              /* Check horizontal scroll bar */
+            if (style & WS_HSCROLL)
+            {
+                clientRect.bottom += GetSystemMetrics(SM_CYHSCROLL);
+                if (PtInRect( &clientRect, mousePos ))
+                {
+                    nHitTestType = HTHSCROLL;
+                }
+            }
+            /* Windows sends this message when a scrollbar is clicked 
+             */
+
+            if(nHitTestType != 0)
+            {
+                SendMessageW(hwnd, WM_NCLBUTTONDOWN, nHitTestType,
+                    MAKELONG(screenMousePos.x, screenMousePos.y));
+            }
+            /* Resume the Capture after scrolling is complete 
+             */
+            if(hWndOldCapture != 0)
+            {
+                SetCapture(hWndOldCapture);
+            }
+
       }
     }