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

Timestamp:

Mar 18, 2000, 5:13:41 PM (25 years ago)

Author:

cbratschi

Message:

merged with Corel 20000317, small icon

File:

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

trunk/src/user32/listbox.cpp

@@ -1 @@
-/* $Id: listbox.cpp,v 1.23 2000-03-17 17:12:07 cbratschi Exp $ */
+/* $Id: listbox.cpp,v 1.24 2000-03-18 16:13:30 cbratschi Exp $ */
 /*
  * Listbox controls
@@ -6 +6 @@
  * Copyright 1999 Christoph Bratschi (ported from WINE)
  *
- * Corel version: 20000212
- * WINE version: 991212
+ * Corel version: 20000317
+ * (WINE version: 991212)
  *
  * Status: ???
@@ -26 +26 @@
 #include "dbglocal.h"
 
-/* Unimplemented yet:
+/* bugs:
  - LBS_NOSEL
  - LBS_USETABSTOPS
@@ -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
  */
 
@@ -340 +342 @@
     descr->width  = rect.right - rect.left;
     descr->height = rect.bottom - rect.top;
-    if (!(descr->style & LBS_NOINTEGRALHEIGHT) && !IS_OWNERDRAW(descr))
+    if (!(descr->style & LBS_NOINTEGRALHEIGHT) && !(descr->style & LBS_OWNERDRAWVARIABLE))
     {
         if ((descr->height > descr->item_height) &&
@@ -480 +482 @@
     {
         DRAWITEMSTRUCT dis;
-        UINT             id = (descr->lphc) ? ID_CB_LISTBOX : GetWindowLongA(hwnd,GWL_ID);
+        UINT           id = (descr->lphc) ? ID_CB_LISTBOX : GetWindowLongA(hwnd,GWL_ID);
 
         if (!item)
@@ -879 +881 @@
     INT i, col_pos = descr->page_size - 1;
     RECT rect;
+    RECT focusRect = {-1, -1, -1, -1};
     HFONT oldFont = 0;
     HBRUSH hbrush, oldBrush = 0;
     DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
+    INT focusItem;
 
     SetRect( &rect, 0, 0, descr->width, descr->height );
@@ -910 +914 @@
     }
 
+    /* Paint all the item, regarding the selection
+       Focus state will be painted after  */
+    focusItem = descr->focus_item;
+    descr->focus_item = -1;
+
     for (i = descr->top_item; i < descr->nb_items; i++)
     {
@@ -917 +926 @@
             rect.bottom = rect.top + descr->items[i].height;
 
+        if (i == focusItem)
+        {
+            /* keep the focus rect, to paint the focus item after */
+            focusRect.left = rect.left;
+            focusRect.right = rect.right;
+            focusRect.top = rect.top;
+            focusRect.bottom = rect.bottom;
+        }
         LISTBOX_DrawItem( hwnd, descr, hdc, &rect, i, ODA_DRAWENTIRE );
         rect.top = rect.bottom;
@@ -946 +963 @@
         }
     }
+
+    /* Paint the focus item now */
+    descr->focus_item = focusItem;
+    if (focusRect.top != focusRect.bottom)
+        LISTBOX_DrawItem( hwnd, descr, hdc, &focusRect, descr->focus_item, ODA_FOCUS );
 
     if (!IS_OWNERDRAW(descr))
@@ -1285 +1307 @@
                                BOOL fully_visible )
 {
-    LISTBOX_SetCaretIndex( hwnd, descr, index, fully_visible );
+    INT oldfocus = descr->focus_item;
+
+    if ((index <  0) || (index >= descr->nb_items) || (oldfocus == index))
+        return;
+
+    /* Important, repaint need ot be done in this order if
+       you want to mimic Windows behavior:
+       1. Remove the focus and paint the item
+       2. Remove the selection and paint the item(s)
+       3. Set the selection and repaint the item(s)
+       4. Set the focus to 'index' and repaint the item */
+
+    /* 1. remove the focus and repaint the item */
+    descr->focus_item = -1;
+    if ((oldfocus != -1) && descr->caret_on && (descr->in_focus))
+        LISTBOX_RepaintItem( hwnd, descr, oldfocus, ODA_FOCUS );
+
+    /* 2. then turn off the previous selection */
+    /* 3. repaint the new selected item */
     if (descr->style & LBS_EXTENDEDSEL)
     {
         if (descr->anchor_item != -1)
         {
-            INT first = MIN( descr->focus_item, descr->anchor_item );
-            INT last  = MAX( descr->focus_item, descr->anchor_item );
+            INT first = MIN( index, descr->anchor_item );
+            INT last  = MAX( index, descr->anchor_item );
             if (first > 0)
                 LISTBOX_SelectItemRange( hwnd, descr, 0, first - 1, FALSE );
@@ -1303 +1343 @@
         LISTBOX_SetSelection( hwnd, descr, index, TRUE, FALSE );
     }
+
+    /* 4. repaint the new item with the focus */
+    descr->focus_item = index;
+    LISTBOX_MakeItemVisible( hwnd, descr, index, fully_visible );
+    if (descr->caret_on && (descr->in_focus))
+        LISTBOX_RepaintItem( hwnd, descr, index, ODA_FOCUS );
 }