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

Timestamp:

Oct 8, 1999, 11:26:08 PM (26 years ago)

Author:

cbratschi

Message:

merged with WINE, other fixes

File:

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

trunk/src/user32/listbox.cpp

@@ -1 @@
-/* $Id: listbox.cpp,v 1.1 1999-09-15 23:18:51 sandervl Exp $ */
+/* $Id: listbox.cpp,v 1.2 1999-10-08 21:24:40 cbratschi Exp $ */
 /*
  * Listbox controls
@@ -5 +5 @@
  * Copyright 1996 Alexandre Julliard
  * Copyright 1999 Christoph Bratschi (ported from WINE)
+ *
+ * WINE version: 990923
  */
 
@@ -624 +626 @@
         INT i;
         LPINT16 p = (LPINT16)tabs;
-        //dbg_decl_str(listbox, 256);
 
         for (i = 0; i < descr->nb_tabs; i++) {
@@ -764 +765 @@
     if (HAS_STRINGS(descr))
     {
-        if (!str) return LB_ERR;
+        if (!str || !str[0]) return LB_ERR;
         if (exact)
         {
@@ -1784 +1785 @@
 
 
+/*************************************************************************
+ * LISTBOX_HandleLButtonDownCombo [Internal]
+ *
+ * Process LButtonDown message for the ComboListBox
+ *
+ * PARAMS
+ *     pWnd       [I] The windows internal structure
+ *     pDescr     [I] The ListBox internal structure
+ *     wParam     [I] Key Flag (WM_LBUTTONDOWN doc for more info)
+ *     x          [I] X Mouse Coordinate
+ *     y          [I] Y Mouse Coordinate
+ *
+ * RETURNS
+ *     0 since we are processing the WM_LBUTTONDOWN Message
+ *
+ * NOTES
+ *  This function is only to be used when a ListBox is a ComboListBox
+ */
+
+static LRESULT LISTBOX_HandleLButtonDownCombo( HWND hwnd, LB_DESCR *pDescr,
+                                               WPARAM wParam, INT x, INT y)
+{
+    RECT clientRect, screenRect;
+    POINT mousePos;
+
+    mousePos.x = x;
+    mousePos.y = y;
+
+    GetClientRect(hwnd, &clientRect);
+
+    if(PtInRect(&clientRect, mousePos))
+    {
+        /* MousePos is in client, resume normal processing */
+        return LISTBOX_HandleLButtonDown( hwnd, pDescr, wParam, x, y);
+    }
+    else
+    {
+        POINT screenMousePos;
+        HWND hWndOldCapture;
+
+        /* Check the Non-Client Area */
+        screenMousePos = mousePos;
+        hWndOldCapture = GetCapture();
+        ReleaseCapture();
+        GetWindowRect(hwnd, &screenRect);
+        ClientToScreen(hwnd, &screenMousePos);
+
+        if(!PtInRect(&screenRect, screenMousePos))
+        {
+            /* Close The Drop Down */
+            SEND_NOTIFICATION( hwnd, pDescr, LBN_SELCANCEL );
+            return 0;
+        }
+        else
+        {
+            /* Check to see the NC is a scrollbar */
+            INT nHitTestType=0;
+            DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
+            /* Check Vertical scroll bar */
+            if (dwStyle & WS_VSCROLL)
+            {
+                clientRect.right += GetSystemMetrics(SM_CXVSCROLL);
+                if (PtInRect( &clientRect, mousePos ))
+                {
+                    nHitTestType = HTVSCROLL;
+                }
+            }
+              /* Check horizontal scroll bar */
+            if (dwStyle & 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)
+            {
+                SendMessageA(hwnd, WM_NCLBUTTONDOWN, nHitTestType,
+                    MAKELONG(screenMousePos.x, screenMousePos.y));
+            }
+            /* Resume the Capture after scrolling is complete
+             */
+            if(hWndOldCapture != 0)
+            {
+                SetCapture(hWndOldCapture);
+            }
+        }
+    }
+    return 0;
+}
+
+
 /***********************************************************************
  *           LISTBOX_HandleLButtonUp
@@ -2162 +2259 @@
     {
         switch (msg)
-        {
-            case WM_CREATE:
-            {
+        {
+            case WM_CREATE:
+            {
                 if (!LISTBOX_Create( hwnd, NULL ))
-                     return -1;
-                //TRACE("creating wnd=%04x descr=%p\n",
-                //      hwnd, *(LB_DESCR **)wnd->wExtra );
-                return 0;
-            }
-            case WM_NCCREATE:
-            {
-                DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
-        
-                /*
-                 * When a listbox is not in a combobox and the look
-                 * is win95,  the WS_BORDER style is replaced with
-                 * the WS_EX_CLIENTEDGE style.
-                 */
-                if (dwStyle & WS_BORDER)
-                {
-                    SetWindowLongA(hwnd,GWL_EXSTYLE,GetWindowLongA(hwnd,GWL_EXSTYLE) | WS_EX_CLIENTEDGE);
-                    SetWindowLongA(hwnd,GWL_STYLE,GetWindowLongA(hwnd,GWL_STYLE)  & ~ WS_BORDER);
-                }
-            }
-        }
+                     return -1;
+                //TRACE("creating wnd=%04x descr=%p\n",
+                //      hwnd, *(LB_DESCR **)wnd->wExtra );
+                return 0;
+            }
+            case WM_NCCREATE:
+            {
+                DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
+
+                /*
+                 * When a listbox is not in a combobox and the look
+                 * is win95,  the WS_BORDER style is replaced with
+                 * the WS_EX_CLIENTEDGE style.
+                 */
+                if (dwStyle & WS_BORDER)
+                {
+                    SetWindowLongA(hwnd,GWL_EXSTYLE,GetWindowLongA(hwnd,GWL_EXSTYLE) | WS_EX_CLIENTEDGE);
+                    SetWindowLongA(hwnd,GWL_STYLE,GetWindowLongA(hwnd,GWL_STYLE)  & ~ WS_BORDER);
+                }
+            }
+        }
         /* Ignore all other messages before we get a WM_CREATE */
         return DefWindowProcA( hwnd, msg, wParam, lParam );
@@ -2214 +2311 @@
            return descr->nb_items;
         else
-           return LB_ERR;       
+           return LB_ERR;
 
     case LB_GETITEMDATA:
@@ -2561 +2658 @@
                     * the mouse is captured to show the tracking of the item.
                     */
-                   captured = descr->captured;
-                   descr->captured = TRUE;
-
-                   LISTBOX_HandleMouseMove( hwnd,
-                                            descr,
-                                            mousePos.x, mousePos.y);
-
-                   descr->captured = captured;
-
-                   /*
-                    * However, when tracking, it is important that we do not
-                    * perform a selection if the cursor is outside the list.
-                    */
+
                    GetClientRect(hwnd, &clientRect);
-
-                   if (!PtInRect( &clientRect, mousePos ))
+                   if (PtInRect( &clientRect, mousePos ))
+                   {
+                       captured = descr->captured;
+                       descr->captured = TRUE;                  
+                
+                       LISTBOX_HandleMouseMove( hwnd, descr,
+                                                    mousePos.x, mousePos.y);
+                       descr->captured = captured;
+                   }
+                   else
                    {
-                     LISTBOX_MoveCaret( hwnd, descr, -1, FALSE );
+                       LISTBOX_HandleMouseMove( hwnd, descr,
+                                                    mousePos.x, mousePos.y);
                    }
+
 
                    return 0;
@@ -2620 +2715 @@
                  return LISTBOX_HandleLButtonUp( hwnd, descr );
             case WM_LBUTTONDOWN:
-                 return LISTBOX_HandleLButtonDown( hwnd, descr, wParam,
+                 return LISTBOX_HandleLButtonDownCombo( hwnd, descr, wParam,
                          (INT16)LOWORD(lParam), (INT16)HIWORD(lParam));
-            /* avoid activation at all costs */
-             case WM_MOUSEACTIVATE:
+            case WM_MOUSEACTIVATE:
                  return MA_NOACTIVATE;
             case WM_NCACTIVATE: