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

Timestamp:

May 22, 2000, 7:21:11 PM (25 years ago)

Author:

cbratschi

Message:

merged controls with Corel WINE 20000513, maximize/minimize fix

File:

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

trunk/src/user32/listbox.cpp

@@ -1 @@
-/* $Id: listbox.cpp,v 1.24 2000-03-18 16:13:30 cbratschi Exp $ */
+/* $Id: listbox.cpp,v 1.25 2000-05-22 17:21:08 cbratschi Exp $ */
 /*
  * Listbox controls
@@ -6 +6 @@
  * Copyright 1999 Christoph Bratschi (ported from WINE)
  *
- * Corel version: 20000317
+ * Corel version: 20000513
  * (WINE version: 991212)
  *
@@ -34 +34 @@
  - VK_LINEDOWN -> bottom most item not always visible
  - performance not optimized
- - ownerdraw is broken -> toolbar customize dialog
  - first item selection mark not redrawn on new selection
+ - LISTBOX_HandleLButtonDownCombo fails, bug in GetWindowRect or ClientToScreen!
+   I clicked on the vertical scrollbar, this happens:
+    t1: SendInternalMessageA WM_LBUTTONDOWN for 68000009 1 1d00c6
+    t1: GetClientRect of 68000009 returned (0,0) (191,110)
+    t1: USER32: GetCapture returned 68000009
+    t1: GetWindowRect 68000009 (450,130) (657,242)
+    t1: ClientToScreen 68000009 (198,29) -> (424,108)
+   mouse position is ok, but screen point is outside window rect!!!
+   the new point is left-top and not on the right!!!
  */
 
@@ -112 +120 @@
 #define SEND_NOTIFICATION(hwnd,descr,code) \
     (SendMessageA( (descr)->owner, WM_COMMAND, \
-     MAKEWPARAM((((descr)->lphc)?ID_CB_LISTBOX:GetWindowLongA(hwnd,GWL_ID)), (code) ), hwnd ))
+     MAKEWPARAM(GetWindowLongA(hwnd,GWL_ID), (code)), hwnd ))
 
 /* Current timer status */
@@ -482 +490 @@
     {
         DRAWITEMSTRUCT dis;
-        UINT           id = (descr->lphc) ? ID_CB_LISTBOX : GetWindowLongA(hwnd,GWL_ID);
+        UINT           id = GetWindowLongA(hwnd,GWL_ID);
 
         if (!item)
@@ -714 +722 @@
         {
             COMPAREITEMSTRUCT cis;
-            UINT                id = (descr->lphc) ? ID_CB_LISTBOX : GetWindowLongA(hwnd,GWL_ID);
+            UINT                id = GetWindowLongA(hwnd,GWL_ID);
 
             cis.CtlType    = ODT_LISTBOX;
@@ -887 +895 @@
     INT focusItem;
 
+    if (descr->style & LBS_NOREDRAW) return 0;
+
     SetRect( &rect, 0, 0, descr->width, descr->height );
-    if (descr->style & LBS_NOREDRAW) return 0;
     if (descr->style & LBS_MULTICOLUMN)
         rect.right = rect.left + descr->column_width;
@@ -966 +975 @@
     /* Paint the focus item now */
     descr->focus_item = focusItem;
-    if (focusRect.top != focusRect.bottom)
+    if (focusRect.top != focusRect.bottom && descr->caret_on)
         LISTBOX_DrawItem( hwnd, descr, hdc, &focusRect, descr->focus_item, ODA_FOCUS );
 
@@ -1281 +1290 @@
     {
         INT oldsel = descr->selected_item;
-        //SvL: Why was this commented out??? (enabled in latest wine code)
-        if (index == oldsel) return LB_OKAY;
-
-        if (oldsel != -1) descr->items[oldsel].selected = FALSE;
-        if (index != -1) descr->items[index].selected = TRUE;
-        descr->selected_item = index;
-        if (oldsel != -1) LISTBOX_RepaintItem( hwnd, descr, oldsel, ODA_SELECT);
-        if (index != -1) LISTBOX_RepaintItem( hwnd, descr, index, ODA_SELECT );
-        if (send_notify && descr->nb_items) SEND_NOTIFICATION( hwnd, descr,
-                               (index != -1) ? LBN_SELCHANGE : LBN_SELCANCEL );
-        else
-            if( descr->lphc ) /* set selection change flag for parent combo */
-                descr->lphc->wState |= CBF_SELCHANGE;
-    }
-    return LB_OKAY;
+
+        if (index != oldsel)
+        {
+          if (oldsel != -1) descr->items[oldsel].selected = FALSE;
+          if (index != -1) descr->items[index].selected = TRUE;
+
+          descr->selected_item = index;
+
+          if (oldsel != -1)
+            LISTBOX_RepaintItem( hwnd, descr, oldsel, ODA_SELECT);
+          if (index != -1)
+            LISTBOX_RepaintItem( hwnd, descr, index, ODA_SELECT );
+
+          if (send_notify && descr->nb_items)
+            SEND_NOTIFICATION( hwnd, descr, (index != -1)
+                               ? LBN_SELCHANGE : LBN_SELCANCEL );
+          else
+            if( descr->lphc )
+              /* set selection change flag for parent combo */
+              descr->lphc->wState |= CBF_SELCHANGE;
+        }
+    }
+
+    /* "If the index parameter is -1, the return value is LB_ERR even though
+     * no error occurred." (At least for single selection boxes.) */
+    return (index == -1) ? LB_ERR : LB_OKAY;
 }
 
@@ -1396 +1416 @@
     {
         MEASUREITEMSTRUCT mis;
-        UINT                id = (descr->lphc) ? ID_CB_LISTBOX : GetWindowLongA(hwnd,GWL_ID);
+        UINT              id = GetWindowLongA(hwnd,GWL_ID);
 
         mis.CtlType    = ODT_LISTBOX;
@@ -1490 +1510 @@
     {
         DELETEITEMSTRUCT dis;
-        UINT               id = (descr->lphc) ? ID_CB_LISTBOX : GetWindowLongA(hwnd,GWL_ID);
+        UINT             id = GetWindowLongA(hwnd,GWL_ID);
 
         dis.CtlType  = ODT_LISTBOX;
@@ -1977 +1997 @@
 
 static LRESULT LISTBOX_HandleLButtonDownCombo( HWND hwnd, LB_DESCR *pDescr,
-                                               WPARAM wParam, INT x, INT y)
+                                               UINT msg,WPARAM wParam, INT x, INT y)
 {
     RECT clientRect, screenRect;
@@ -1989 +2009 @@
     if(PtInRect(&clientRect, mousePos))
     {
-        /* MousePos is in client, resume normal processing */
-        return LISTBOX_HandleLButtonDown( hwnd, pDescr, wParam, x, y);
+      /* MousePos is in client, resume normal processing */
+      if (msg == WM_LBUTTONDOWN)
+      {
+         pDescr->lphc->droppedIndex = pDescr->nb_items ? pDescr->selected_item : -1;
+         return LISTBOX_HandleLButtonDown( hwnd, pDescr, wParam, x, y);
+      }
+      else if (pDescr->style & LBS_NOTIFY)
+        SEND_NOTIFICATION( hwnd, pDescr, LBN_DBLCLK );
+      return 0;
     }
     else
     {
-        POINT screenMousePos;
-        HWND hWndOldCapture;
-
-        /* Check the Non-Client Area */
-        screenMousePos = mousePos;
-        hWndOldCapture = GetCapture();
+      POINT screenMousePos;
+      RECT screenRect;
+      HWND hWndOldCapture;
+//CB: read buglist
+      /* Check the Non-Client Area */
+      screenMousePos = mousePos;
+      hWndOldCapture = GetCapture();
+      GetWindowRect(hwnd,&screenRect);
+      ClientToScreen(hwnd,&screenMousePos);
+
+      if (!PtInRect(&screenRect,screenMousePos))
+      {
         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);
-            }
-        }
+        LISTBOX_SetSelection( hwnd, pDescr, pDescr->lphc->droppedIndex, FALSE, FALSE );
+        COMBO_FlipListbox( pDescr->lphc, FALSE, FALSE );
+
+        return 0;
+      } 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);
+        }
+      }
     }
     return 0;
@@ -2135 +2144 @@
 {
     INT index;
-    TIMER_DIRECTION dir;
+    TIMER_DIRECTION dir = LB_TIMER_NONE;
 
     if (GetCapture() != hwnd) return 0;
@@ -2156 +2165 @@
             x = descr->width - 1;
         }
-        else dir = LB_TIMER_NONE;  /* inside */
     }
     else
@@ -2162 +2170 @@
         if (y < 0) dir = LB_TIMER_UP;  /* above */
         else if (y >= descr->height) dir = LB_TIMER_DOWN;  /* below */
-        else dir = LB_TIMER_NONE;  /* inside */
     }
 
@@ -2356 +2363 @@
     descr->nb_tabs       = 0;
     descr->tabs          = NULL;
-    descr->caret_on      = TRUE;
+    descr->caret_on      = lphc ? FALSE:TRUE;
     descr->in_focus      = FALSE;
     descr->captured      = FALSE;
@@ -2388 +2395 @@
         else
         {
-            UINT        id = (descr->lphc ) ? ID_CB_LISTBOX : GetWindowLongA(hwnd,GWL_ID);
+            UINT        id = GetWindowLongA(hwnd,GWL_ID);
 
             mis.CtlType    = ODT_LISTBOX;
@@ -3062 +3069 @@
             }
             case WM_LBUTTONDOWN:
-                 return LISTBOX_HandleLButtonDownCombo( hwnd, descr, wParam,
+            case WM_LBUTTONDBLCLK:
+                 return LISTBOX_HandleLButtonDownCombo( hwnd, descr,msg, wParam,
                          (INT16)LOWORD(lParam), (INT16)HIWORD(lParam));
             case WM_MOUSEACTIVATE:
@@ -3077 +3085 @@
                            && (wParam == VK_DOWN || wParam == VK_UP)) )
                      {
-                         COMBO_FlipListbox( lphc, FALSE );
+                         COMBO_FlipListbox( lphc, FALSE, FALSE );
                          return 0;
                      }