Changeset 3585 for trunk/src/comctl32/listview.cpp

Timestamp:

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

Author:

cbratschi

Message:

merged with Corel WINE 20000513, added new DPA_* functions

File:

• trunk/src/comctl32/listview.cpp (modified) (17 diffs)

trunk/src/comctl32/listview.cpp

@@ -1 @@
-/*$Id: listview.cpp,v 1.18 2000-05-10 19:50:32 cbratschi Exp $*/
+/*$Id: listview.cpp,v 1.19 2000-05-22 17:25:08 cbratschi Exp $*/
 /*
  * Listview control
@@ -50 +50 @@
 /*
  Most identical with:
- - Corel 20000317 level
+ - Corel 20000513 level
  - (WINE 20000130 level)
 */
@@ -831 +831 @@
 }
 
+static BOOL LISTVIEW_IsItemSelected(LISTVIEW_INFO *infoPtr,INT nItem)
+{
+  LISTVIEW_ITEM *lpItem;
+  INT pos = 0;
+
+  while ((lpItem = (LISTVIEW_ITEM*)DPA_GetPtr(infoPtr->hdpaSelItems,pos)) != NULL)
+  {
+    if (DPA_GetPtrIndex(infoPtr->hdpaItems,lpItem) == nItem) return TRUE;
+    pos++;
+  }
+
+  return FALSE;
+}
+
 /***
  * DESCRIPTION:
@@ -851 +865 @@
   for (i = nFirst; i <= nLast; i++)
   {
-    LISTVIEW_SetItemState(hwnd,i,LVIS_SELECTED,LVIS_SELECTED);
+    if (!LISTVIEW_IsItemSelected(infoPtr,nItem))
+    {
+      LISTVIEW_SetItemState(hwnd,i,LVIS_SELECTED,LVIS_SELECTED);
+    }
   }
 
   LISTVIEW_SetItemFocus(hwnd, nItem);
-  infoPtr->nSelectionMark = nItem;
 }
 
@@ -873 +889 @@
   LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd);
 
-  LISTVIEW_SetItemState(hwnd,nItem,LVIS_SELECTED,LVIS_SELECTED);
+  if (!LISTVIEW_IsItemSelected(infoPtr,nItem))
+  {
+    LISTVIEW_SetItemState(hwnd,nItem,LVIS_SELECTED,LVIS_SELECTED);
+  }
 
   LISTVIEW_SetItemFocus(hwnd, nItem);
-  infoPtr->nSelectionMark = nItem;
 }
 
@@ -894 +912 @@
 {
   LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd);
-  BOOL bResult;
-
-  if (LISTVIEW_GetItemState(hwnd, nItem, LVIS_SELECTED) & LVIS_SELECTED)
-  {
-    LISTVIEW_SetItemState(hwnd,nItem,0,LVIS_SELECTED);
-    bResult = FALSE;
-  }
-  else
-  {
-    LISTVIEW_SetItemState(hwnd,nItem,LVIS_SELECTED,LVIS_SELECTED);
+  BOOL bResult = FALSE;
+  DWORD state = 0,stateMask = 0;
+
+  if (nItem != infoPtr->nFocusedItem)
+  {
+    stateMask = LVIS_FOCUSED;
+    LISTVIEW_SetItemState(hwnd,infoPtr->nFocusedItem,state,stateMask);
+  }
+
+  stateMask = LVIS_SELECTED;
+  if (!LISTVIEW_IsItemSelected(infoPtr,nItem))
+  {
     bResult = TRUE;
-  }
-
-  LISTVIEW_SetItemFocus(hwnd, nItem);
+    state = LVIS_SELECTED;
+  }
   infoPtr->nSelectionMark = nItem;
+  LISTVIEW_SetItemState(hwnd,nItem,state,stateMask);
+
+  if (nItem != infoPtr->nFocusedItem)
+  {
+    state =  LVIS_FOCUSED;
+    stateMask = LVIS_FOCUSED;
+    infoPtr->nFocusedItem = nItem;
+    LISTVIEW_SetItemState(hwnd,nItem,state,stateMask);
+  }
 
   return bResult;
@@ -970 +998 @@
       if ((i < nFirst) || (i > nLast))
       {
-        LISTVIEW_SetItemState(hwnd,i,0,LVIS_SELECTED);
+        if (LISTVIEW_IsItemSelected(infoPtr,i))
+        {
+          LISTVIEW_SetItemState(hwnd,i,0,LVIS_SELECTED);
+        }
       }
       else
       {
-        LISTVIEW_SetItemState(hwnd,i,LVIS_SELECTED,LVIS_SELECTED);
-      }
-    }
+        if (!LISTVIEW_IsItemSelected(infoPtr,i))
+        {
+          LISTVIEW_SetItemState(hwnd,i,LVIS_SELECTED,LVIS_SELECTED);
+        }
+      }
+    }
+    LISTVIEW_SetItemState(hwnd,infoPtr->nFocusedItem,0,LVIS_FOCUSED);
+
+    infoPtr->nFocusedItem = nItem;
+    LISTVIEW_SetItemState(hwnd,nItem,LVIS_SELECTED | LVIS_FOCUSED,LVIS_SELECTED | LVIS_FOCUSED);
+
   }
   else
@@ -991 +1030 @@
     rcSel.bottom = max(ptSelMark.y, ptItem.y) + infoPtr->nItemHeight;
     LISTVIEW_SetSelectionRect(hwnd, rcSel);
-  }
-
-  LISTVIEW_SetItemFocus(hwnd, nItem);
+    LISTVIEW_SetItemFocus(hwnd, nItem);
+  }
 }
 
@@ -3639 +3677 @@
               if (isUnicodeNotify(&infoPtr->header))
               {
-                Str_SetPtrW(&lpItemData->pszText,dispInfo.item.pszText);
+                Str_SetPtrW(&lpItemData->pszText,(dispInfo.item.pszText == LPSTR_TEXTCALLBACKW) ? NULL:dispInfo.item.pszText);
               } else
               {
-                INT len = dispInfo.item.pszText ? lstrlenA((LPSTR)dispInfo.item.pszText):0;
+                INT len = (dispInfo.item.pszText && (dispInfo.item.pszText != LPSTR_TEXTCALLBACKW)) ? lstrlenA((LPSTR)dispInfo.item.pszText):0;
 
                 if (lpItemData->pszText != LPSTR_TEXTCALLBACKW) COMCTL32_Free(lpItemData->pszText);
@@ -3654 +3692 @@
             }
             /* Make sure the source string is valid */
-            if (!dispInfo.item.pszText)
+            if (!dispInfo.item.pszText || (dispInfo.item.pszText == LPSTR_TEXTCALLBACKW))
             {
               if (!internal)
@@ -6486 +6524 @@
   INT maxY = infoPtr->maxScroll.y-infoPtr->scrollPage.y,oldY = infoPtr->lefttop.y;
 
+  if (infoPtr->hwndEdit)
+  {
+    SendMessageA(infoPtr->hwndEdit, WM_KILLFOCUS, 0, 0);
+  }
+
   switch (nScrollCode)
   {
@@ -6567 +6610 @@
   LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)LISTVIEW_GetInfoPtr(hwnd);
   INT maxX = infoPtr->maxScroll.x-infoPtr->scrollPage.x,oldX = infoPtr->lefttop.x;
+
+  if (infoPtr->hwndEdit)
+  {
+    SendMessageA(infoPtr->hwndEdit, WM_KILLFOCUS, 0, 0);
+  }
 
   switch (nScrollCode)
@@ -6743 +6791 @@
     break;
 
+  case VK_NEXT:
+    if (infoPtr->uView == LVS_REPORT)
+    {
+      nItem = infoPtr->nFocusedItem + LISTVIEW_GetCountPerColumn(hwnd);
+    }
+    else
+    {
+      nItem = infoPtr->nFocusedItem + LISTVIEW_GetCountPerColumn(hwnd) * LISTVIEW_GetCountPerRow(hwnd);
+    }
+    if(nItem >= GETITEMCOUNT(infoPtr)) nItem = GETITEMCOUNT(infoPtr) - 1;
+    break;
+
   case VK_PRIOR:
-    /* TO DO */
-    break;
-
-  case VK_NEXT:
-    /* TO DO */
+    if (infoPtr->uView == LVS_REPORT)
+    {
+      nItem = infoPtr->nFocusedItem - LISTVIEW_GetCountPerColumn(hwnd);
+    }
+    else
+    {
+      nItem = infoPtr->nFocusedItem - LISTVIEW_GetCountPerColumn(hwnd) * LISTVIEW_GetCountPerRow(hwnd);
+    }
+    if(nItem < 0) nItem = 0;
     break;
   }
@@ -7011 +7075 @@
   sendNotify(hwnd,NM_RELEASEDCAPTURE);
 
-  if (infoPtr->bFocus == FALSE)
+  if (!infoPtr->bFocus)
     SetFocus(hwnd);
 
@@ -7024 +7088 @@
     if (infoPtr->dwStyle & LVS_SINGLESEL)
     {
-      if ((LISTVIEW_GetItemState(hwnd, nItem, LVIS_SELECTED) & LVIS_SELECTED) && infoPtr->bDoEditLabel != TRUE)
+      if (LISTVIEW_IsItemSelected(infoPtr,nItem) && !infoPtr->bDoEditLabel)
         infoPtr->bDoEditLabel = TRUE;
       else
@@ -7033 +7097 @@
       if ((wKey & MK_CONTROL) && (wKey & MK_SHIFT))
       {
-        if (bGroupSelect != FALSE)
+        if (bGroupSelect)
         {
           LISTVIEW_AddGroupSelection(hwnd, nItem);
@@ -7052 +7116 @@
       else
       {
-        if ((LISTVIEW_GetItemState(hwnd, nItem, LVIS_SELECTED) & LVIS_SELECTED) && (infoPtr->bDoEditLabel != TRUE))
+        if (LISTVIEW_IsItemSelected(infoPtr,nItem) && !infoPtr->bDoEditLabel)
           infoPtr->bDoEditLabel = TRUE;
         else