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

Timestamp:

Mar 23, 2000, 6:14:45 PM (25 years ago)

Author:

cbratschi

Message:

dynamic WINMM linking

File:

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

trunk/src/comctl32/listview.cpp

@@ -1 @@
-/*$Id: listview.cpp,v 1.5 2000-03-22 16:56:36 cbratschi Exp $*/
+/*$Id: listview.cpp,v 1.6 2000-03-23 17:14:34 cbratschi Exp $*/
 /*
  * Listview control
@@ -12 +12 @@
  *
  * TODO:
- *   1. No horizontal scrolling when header is larger than the client area.
- *   2. Drawing optimizations.
- *   3. Hot item handling.
+ *   - Hot item handling.
  *
  * Notifications:
@@ -35 +33 @@
  *   LISTVIEW_RedrawItems : empty stub
  *   LISTVIEW_Update : not completed
- * WM_SETREDRAW not implemented
  *
  * the sort algorithm isn't stable (order of same items isn't fixed)!!!
@@ -156 +153 @@
 static LRESULT LISTVIEW_GetStringWidth(HWND hwnd,HDC hdc,LPWSTR lpszText,BOOL unicode);
 static BOOL    LISTVIEW_EnsureVisible(HWND hwnd,INT nItem,BOOL bPartial);
-static VOID    LISTVIEW_UpdateHeaderSize(HWND hwnd, INT nNewScrollPos);
+static VOID    LISTVIEW_UpdateHeaderSize(HWND hwnd,INT nNewScrollPos,INT xScroll);
 
 static VOID LISTVIEW_Refresh(HWND hwnd)
@@ -175 +172 @@
 
     GetClientRect(hwnd,&rect);
-    GetClientRect(infoPtr->hwndHeader,&rect2);
-    rect.top += rect2.bottom;
+    GetWindowRect(infoPtr->hwndHeader,&rect2);
+    rect.top += rect2.bottom-rect2.top;
     InvalidateRect(hwnd,&rect,TRUE);
   } else InvalidateRect(hwnd,NULL,TRUE);
@@ -224 +221 @@
   if (infoPtr->refreshFlags & (RF_REFRESH | RF_NOREDRAW)) return;
   LISTVIEW_GetItemRect(hwnd,nItem,&rect,LVIR_SELECTBOUNDS);
+//CB: todo: clip header
   InvalidateRect(hwnd,&rect,TRUE);
 }
@@ -231 +229 @@
   LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)LISTVIEW_GetInfoPtr(hwnd);
   RECT rect,header;
-  INT xOffset = infoPtr->lefttop.x*LISTVIEW_SCROLL_DIV_SIZE;
+  INT xOffset = infoPtr->lefttop.x*infoPtr->scrollStep.x;
 
   if (infoPtr->refreshFlags & (RF_REFRESH | RF_NOREDRAW)) return;
   LISTVIEW_GetItemRect(hwnd,nItem,&rect,LVIR_SELECTBOUNDS);
-
+//CB: todo: clip header
   //get header rect
   Header_GetItemRect(infoPtr->hwndHeader,nSubItem,&header);
@@ -260 +258 @@
     //clip header
     GetClientRect(hwnd,&rect);
-    GetClientRect(infoPtr->hwndHeader,&header);
+    GetWindowRect(infoPtr->hwndHeader,&header);
+
     if (yScroll < 0)
-    {
-      //up
-      rect.top += header.bottom-yScroll;
-      ScrollWindowEx(hwnd,xScroll,yScroll,&rect,NULL,0,NULL,0);
-      rect.top = rect.bottom+yScroll;
-      if (rect.top < header.bottom) rect.top = header.bottom;
-      InvalidateRect(hwnd,&rect,TRUE);//CB: still wrong pixels
+    { //up
+      INT headerH = header.bottom-header.top;
+
+      rect.top += headerH-yScroll;
+      if (rect.top < rect.bottom)
+      {
+        ScrollWindowEx(hwnd,xScroll,yScroll,&rect,NULL,0,NULL,0);
+        rect.top = rect.bottom+yScroll;
+        if (rect.top < headerH) rect.top = headerH;
+        InvalidateRect(hwnd,&rect,TRUE);//CB: still wrong pixels
+      } else
+      {
+        rect.top = headerH;
+        InvalidateRect(hwnd,&rect,TRUE);
+      }
     } else if (yScroll > 0)
     { //down
-      rect.top += header.bottom;
+      rect.top += header.bottom-header.top;
       ScrollWindowEx(hwnd,xScroll,yScroll,&rect,NULL,0,NULL,SW_INVALIDATE);
     }
     if (yScroll == 0)
     {
-      rect.top += header.bottom;
+      rect.top += header.bottom-header.top;
       ScrollWindowEx(hwnd,xScroll,yScroll,&rect,NULL,0,NULL,SW_INVALIDATE);
     }
-    if (xScroll != 0) LISTVIEW_UpdateHeaderSize(hwnd,infoPtr->lefttop.x);
+
+    if (xScroll != 0) LISTVIEW_UpdateHeaderSize(hwnd,infoPtr->lefttop.x,xScroll);
   } else ScrollWindowEx(hwnd,xScroll,yScroll,NULL,NULL,0,NULL,SW_INVALIDATE);
 }
@@ -297 +305 @@
  * NOTES
  */
-static VOID LISTVIEW_UpdateHeaderSize(HWND hwnd, INT nNewScrollPos)
+static VOID LISTVIEW_UpdateHeaderSize(HWND hwnd, INT nNewScrollPos,INT xScroll)
 {
     LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)LISTVIEW_GetInfoPtr(hwnd);
@@ -310 +318 @@
 
     MapWindowPoints(HWND_DESKTOP, hwnd, point, 2);
-    point[0].x = -(nNewScrollPos * LISTVIEW_SCROLL_DIV_SIZE);
-    point[1].x += (nNewScrollPos * LISTVIEW_SCROLL_DIV_SIZE);
-
-    SetWindowPos(infoPtr->hwndHeader,0,
-        point[0].x,point[0].y,point[1].x,point[1].y,
-        SWP_NOZORDER | SWP_NOACTIVATE);
+    point[0].x = -nNewScrollPos*infoPtr->scrollStep.x;
+    point[1].x += nNewScrollPos*infoPtr->scrollStep.x;
+
+    //CB: todo: smoother scrolling (BTW: SWP_NOREDRAW doesn't work!)
+    SetWindowPos(infoPtr->hwndHeader,0,point[0].x,point[0].y,point[1].x,point[1].y,SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW);
 }
 
@@ -340 +347 @@
   if (dwStyle & LVS_NOSCROLL)
   {
+    infoPtr->lefttop.x = 0;
+    infoPtr->lefttop.y = 0;
+    infoPtr->maxScroll = infoPtr->lefttop;
+    infoPtr->scrollPage = infoPtr->lefttop;
+    infoPtr->scrollStep = infoPtr->lefttop;
     ShowScrollBar(hwnd,SB_BOTH,FALSE);
     return;
@@ -353 +365 @@
     INT nCountPerRow = LISTVIEW_GetCountPerRow(hwnd);
     INT nNumOfItems = GETITEMCOUNT(infoPtr);
-//CB: todo: doesn't work!
-    infoPtr->maxScroll.x = nNumOfItems / nCountPerColumn+1;
+
+    infoPtr->maxScroll.x = nNumOfItems / nCountPerColumn;
     if ((nNumOfItems % nCountPerColumn) == 0)
       infoPtr->maxScroll.x--;
@@ -360 +372 @@
     infoPtr->lefttop.x = LISTVIEW_GetTopIndex(hwnd) / nCountPerColumn;
     infoPtr->scrollPage.x = nCountPerRow;
+    infoPtr->scrollStep.x = infoPtr->nItemWidth;
 
     scrollInfo.nMin  = 0;
@@ -373 +386 @@
     infoPtr->lefttop.y = LISTVIEW_GetTopIndex(hwnd);
     infoPtr->scrollPage.y = LISTVIEW_GetCountPerColumn(hwnd);
+    infoPtr->scrollStep.y = infoPtr->nItemHeight;
 
     scrollInfo.nMin  = 0;
@@ -388 +402 @@
     infoPtr->scrollPage.x = nListWidth / LISTVIEW_SCROLL_DIV_SIZE;
     infoPtr->maxScroll.x = max(infoPtr->nItemWidth / LISTVIEW_SCROLL_DIV_SIZE, 0);
+    infoPtr->scrollStep.x = LISTVIEW_SCROLL_DIV_SIZE;
 
     scrollInfo.nMin  = 0;
@@ -397 +412 @@
 
     /* Update the Header Control */
-    LISTVIEW_UpdateHeaderSize(hwnd,infoPtr->lefttop.x);
+    LISTVIEW_UpdateHeaderSize(hwnd,infoPtr->lefttop.x,0);
   } else
   {
@@ -412 +427 @@
       infoPtr->maxScroll.x = max(nViewWidth / LISTVIEW_SCROLL_DIV_SIZE, 0);
       infoPtr->scrollPage.x = nListWidth / LISTVIEW_SCROLL_DIV_SIZE;
+      infoPtr->scrollStep.x = LISTVIEW_SCROLL_DIV_SIZE;
 
       scrollInfo.nMin  = 0;
@@ -426 +442 @@
       infoPtr->maxScroll.y = max(nViewHeight / LISTVIEW_SCROLL_DIV_SIZE,0);
       infoPtr->scrollPage.y = nListHeight / LISTVIEW_SCROLL_DIV_SIZE;
+      infoPtr->scrollStep.y = LISTVIEW_SCROLL_DIV_SIZE;
 
       scrollInfo.nMin  = 0;
@@ -615 +632 @@
 //        lprcView->left, lprcView->top, lprcView->right, lprcView->bottom);
 
-  if (lprcView != NULL)
+  if (lprcView)
   {
     bResult = TRUE;
@@ -645 +662 @@
   POINT ptOrigin;
 
-//  TRACE("(hwnd=%x, lprcView=%p)\n", hwnd, lprcView);
-
-  if (lprcView != NULL)
+  if (lprcView)
   {
     bResult = LISTVIEW_GetOrigin(hwnd, &ptOrigin);
-    if (bResult != FALSE)
+    if (bResult)
     {
       lprcView->left = infoPtr->rcView.left + ptOrigin.x;
@@ -657 +672 @@
       lprcView->bottom = infoPtr->rcView.bottom + ptOrigin.y;
     }
-
-//    TRACE("(left=%d, top=%d, right=%d, bottom=%d)\n",
-//          lprcView->left, lprcView->top, lprcView->right, lprcView->bottom);
   }
 
@@ -719 +731 @@
   INT i;
 
-//  TRACE("(hwnd=%x)\n", hwnd);
-
   if (uView == LVS_ICON)
   {
@@ -731 +741 @@
     for (i = 0; i < nHeaderItemCount; i++)
     {
-      if (Header_GetItemRect(infoPtr->hwndHeader, i, &rcHeaderItem) != 0)
+      if (Header_GetItemRect(infoPtr->hwndHeader, i, &rcHeaderItem))
       {
         nItemWidth += (rcHeaderItem.right - rcHeaderItem.left);
@@ -2061 +2071 @@
   INT nColumnCount = Header_GetItemCount(infoPtr->hwndHeader);
   RECT rcItem,rcClient,*rcHeader;
-  INT  j,nItem,nLast,xOffset = infoPtr->lefttop.x*LISTVIEW_SCROLL_DIV_SIZE;
+  INT  j,nItem,nLast,xOffset = infoPtr->lefttop.x*infoPtr->scrollStep.x;
 
   nItem = LISTVIEW_GetTopIndex(hwnd);
@@ -2248 +2258 @@
 
   GetClientRect(hwnd,&rcClient);
-//CB: todo: hscroll!
+
   for (i = 0; i < nColumnCount; i++)
   {
@@ -2977 +2987 @@
 
   rcItem.left = LVIR_BOUNDS;
-  if (LISTVIEW_GetItemRect(hwnd, nItem, &rcItem) != FALSE)
+  if (LISTVIEW_GetItemRect(hwnd, nItem, &rcItem))
   {
     if (rcItem.left < infoPtr->rcList.left)
@@ -2986 +2996 @@
         if (uView == LVS_LIST)
         {
-          nScrollPosWidth = infoPtr->nItemWidth;
+          nScrollPosWidth = infoPtr->scrollStep.x;
           rcItem.left += infoPtr->rcList.left;
         } else if ((uView == LVS_SMALLICON) || (uView == LVS_ICON))
         {
-          nScrollPosWidth = LISTVIEW_SCROLL_DIV_SIZE;
+          nScrollPosWidth = infoPtr->scrollStep.x;
           rcItem.left += infoPtr->rcList.left;
         }
@@ -2996 +3006 @@
         /* When in LVS_REPORT view, the scroll position should
            not be updated. */
-        if (nScrollPosWidth != 0)
+        if (nScrollPosWidth)
         {
           if (rcItem.left % nScrollPosWidth == 0)
@@ -3018 +3028 @@
         {
           rcItem.right -= infoPtr->rcList.right;
-          nScrollPosWidth = infoPtr->nItemWidth;
+          nScrollPosWidth = infoPtr->scrollStep.x;
         } else if ((uView == LVS_SMALLICON) || (uView == LVS_ICON))
         {
           rcItem.right -= infoPtr->rcList.right;
-          nScrollPosWidth = LISTVIEW_SCROLL_DIV_SIZE;
+          nScrollPosWidth = infoPtr->scrollStep.x;
         }
 
         /* When in LVS_REPORT view, the scroll position should
            not be updated. */
-        if (nScrollPosWidth != 0)
+        if (nScrollPosWidth)
         {
           SCROLLINFO scrollInfo;
@@ -3053 +3063 @@
         {
           rcItem.top -= infoPtr->rcList.top;
-          nScrollPosHeight = infoPtr->nItemHeight;
+          nScrollPosHeight = infoPtr->scrollStep.y;
         }
         else if ((uView == LVS_ICON) || (uView == LVS_SMALLICON))
         {
-          nScrollPosHeight = LISTVIEW_SCROLL_DIV_SIZE;
+          nScrollPosHeight = infoPtr->scrollStep.y;
           rcItem.top += infoPtr->rcList.top;
         }
@@ -3072 +3082 @@
         }
       }
-    }
-    else if (rcItem.bottom > infoPtr->rcList.bottom)
+    } else if (rcItem.bottom > infoPtr->rcList.bottom)
     {
       /* scroll down */
@@ -3081 +3090 @@
         {
           rcItem.bottom -= infoPtr->rcList.bottom;
-          nScrollPosHeight = infoPtr->nItemHeight;
-        }
-        else if ((uView == LVS_ICON) || (uView == LVS_SMALLICON))
-        {
-          nScrollPosHeight = LISTVIEW_SCROLL_DIV_SIZE;
+          nScrollPosHeight = infoPtr->scrollStep.y;
+        } else if ((uView == LVS_ICON) || (uView == LVS_SMALLICON))
+        {
+          nScrollPosHeight = infoPtr->scrollStep.x;
           rcItem.bottom -= infoPtr->rcList.bottom;
         }
@@ -3103 +3111 @@
 
   if ((oldlefttop.x != infoPtr->lefttop.x) || (oldlefttop.y != infoPtr->lefttop.y))
-    LISTVIEW_ScrollWindow(hwnd,(oldlefttop.x-infoPtr->lefttop.x)*LISTVIEW_SCROLL_DIV_SIZE,(oldlefttop.y-infoPtr->lefttop.y)*infoPtr->nItemHeight,uView);
+    LISTVIEW_ScrollWindow(hwnd,(oldlefttop.x-infoPtr->lefttop.x)*infoPtr->scrollStep.x,(oldlefttop.y-infoPtr->lefttop.y)*infoPtr->scrollStep.y,uView);
 
   return TRUE;
@@ -4805 +4813 @@
   {
     if (dwStyle & WS_HSCROLL)
-      lpptOrigin->x = -infoPtr->lefttop.x*LISTVIEW_SCROLL_DIV_SIZE;
+      lpptOrigin->x = -infoPtr->lefttop.x*infoPtr->scrollStep.x;
     else
       lpptOrigin->x = 0;
 
     if (dwStyle & WS_VSCROLL)
-      lpptOrigin->y = -infoPtr->lefttop.y*LISTVIEW_SCROLL_DIV_SIZE;
+      lpptOrigin->y = -infoPtr->lefttop.y*infoPtr->scrollStep.y;
     else
       lpptOrigin->y = 0;
@@ -6460 +6468 @@
     DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
     UINT uView =  dwStyle & LVS_TYPEMASK;
-    INT xScroll = (oldX-infoPtr->lefttop.x)* LISTVIEW_SCROLL_DIV_SIZE;//CB:tocheck
+    INT xScroll = (oldX-infoPtr->lefttop.x)*infoPtr->scrollStep.x;
 
     ZeroMemory(&scrollInfo, sizeof(SCROLLINFO));
@@ -7103 +7111 @@
   {
     /* handle notification from header control */
-    if ((lpnmh->code == HDN_ENDTRACKA) || (lpnmh->code == HDN_ENDTRACKW))
-    {
-      infoPtr->nItemWidth = LISTVIEW_GetItemWidth(hwnd);
-      LISTVIEW_Refresh(hwnd);
-    }
-    else if((lpnmh->code ==  HDN_ITEMCLICKA) || (lpnmh->code ==  HDN_ITEMCLICKW))
-    {
-        /* Handle sorting by Header Column */
-        NMLISTVIEW nmlv;
-        LPNMHEADERA pnmHeader = (LPNMHEADERA) lpnmh;
-
-        ZeroMemory(&nmlv, sizeof(NMLISTVIEW));
-        nmlv.iItem = -1;
-        nmlv.iSubItem = pnmHeader->iItem;
-
-        sendNotify(hwnd,LVN_COLUMNCLICK,&nmlv.hdr);
-
-    }
-    else if(lpnmh->code == NM_RELEASEDCAPTURE)
-    {
-      /* Idealy this should be done in HDN_ENDTRACKA
-       * but since SetItemBounds in Header.c is called after
-       * the notification is sent, it is neccessary to handle the
-       * update of the scroll bar here (Header.c works fine as it is,
-       * no need to disturb it)
-       */
-      infoPtr->nItemWidth = LISTVIEW_GetItemWidth(hwnd);
-      LISTVIEW_UpdateScroll(hwnd);
-      LISTVIEW_Refresh(hwnd);
-    }
-
+    if ((lpnmh->code == HDN_ITEMCHANGEDA) || (lpnmh->code == HDN_ITEMCHANGEDW))
+    {
+      INT width;
+
+      width = LISTVIEW_GetItemWidth(hwnd);
+      if (width != infoPtr->nItemWidth)
+      {
+        infoPtr->nItemWidth = width;
+        LISTVIEW_UpdateScroll(hwnd);
+        LISTVIEW_Refresh(hwnd);
+      }
+    } else if((lpnmh->code ==  HDN_ITEMCLICKA) || (lpnmh->code ==  HDN_ITEMCLICKW))
+    {
+      /* Handle sorting by Header Column */
+      NMLISTVIEW nmlv;
+      LPNMHEADERA pnmHeader = (LPNMHEADERA)lpnmh;
+
+      ZeroMemory(&nmlv, sizeof(NMLISTVIEW));
+      nmlv.iItem = -1;
+      nmlv.iSubItem = pnmHeader->iItem;
+
+      sendNotify(hwnd,LVN_COLUMNCLICK,&nmlv.hdr);
+    }
   }
 
@@ -7409 +7409 @@
 {
   LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)LISTVIEW_GetInfoPtr(hwnd);
-  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
-  UINT uView = lStyle & LVS_TYPEMASK;
+  DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
+  UINT uView = dwStyle & LVS_TYPEMASK;
 
   LISTVIEW_UpdateSize(hwnd);
+  LISTVIEW_UpdateScroll(hwnd);
 
   if ((uView == LVS_SMALLICON) || (uView == LVS_ICON))
   {
-    if (lStyle & LVS_ALIGNLEFT)
-    {
+    if (dwStyle & LVS_ALIGNLEFT)
       LISTVIEW_AlignLeft(hwnd);
-    }
     else
-    {
       LISTVIEW_AlignTop(hwnd);
-    }
-  }
-
-  /* invalidate client area + erase background */
-  infoPtr->refreshFlags |= RF_UPDATESCROLL;
-  LISTVIEW_QueueRefresh(hwnd);
-
+  }
   return 0;
 }
@@ -7446 +7438 @@
 {
   LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)LISTVIEW_GetInfoPtr(hwnd);
-  LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
-  UINT uView = lStyle & LVS_TYPEMASK;
+  LONG dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
+  UINT uView = dwStyle & LVS_TYPEMASK;
   RECT rcList;
 
@@ -7458 +7450 @@
   if (uView == LVS_LIST)
   {
-    if ((lStyle & WS_HSCROLL) == 0)
+    if (!(dwStyle & WS_HSCROLL))
     {
       INT nHScrollHeight = GetSystemMetrics(SM_CYHSCROLL);
@@ -7466 +7458 @@
       }
     }
-  }
-  else if (uView == LVS_REPORT)
-  {
-    HDLAYOUT hl;
-    WINDOWPOS wp;
-
-    hl.prc = &rcList;
-    hl.pwpos = &wp;
-    Header_Layout(infoPtr->hwndHeader, &hl);
-    SetWindowPos(infoPtr->hwndHeader,hwnd,wp.x,wp.y,wp.cx,wp.cy,wp.flags);
-    if (!(LVS_NOCOLUMNHEADER & lStyle))
-    {
-      infoPtr->rcList.top = max(wp.cy, 0);
+  } else if (uView == LVS_REPORT)
+  {
+    if (!(dwStyle & LVS_NOCOLUMNHEADER))
+    {
+      HDLAYOUT hl;
+      WINDOWPOS wp;
+
+      hl.prc = &rcList;
+      hl.pwpos = &wp;
+      Header_Layout(infoPtr->hwndHeader, &hl);
+      SetWindowPos(infoPtr->hwndHeader,hwnd,wp.x,wp.y,wp.cx,wp.cy,wp.flags);
+      infoPtr->rcList.top = max(wp.cy,0);
     }
   }
@@ -7498 +7489 @@
                                  LPSTYLESTRUCT lpss)
 {
-  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd);
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)LISTVIEW_GetInfoPtr(hwnd);
   UINT uNewView = lpss->styleNew & LVS_TYPEMASK;
   UINT uOldView = lpss->styleOld & LVS_TYPEMASK;
   RECT rcList = infoPtr->rcList;
-
-//  TRACE("(hwnd=%x, styletype=%x, stylestruct=%p)\n",
-//        hwnd, wStyleType, lpss);
 
   if (wStyleType == GWL_STYLE)
@@ -8210 +8198 @@
 
   ZeroMemory(&wndClass, sizeof(WNDCLASSA));
-  wndClass.style = CS_GLOBALCLASS | CS_DBLCLKS;
+  wndClass.style = CS_GLOBALCLASS | CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW;
   wndClass.lpfnWndProc = (WNDPROC)LISTVIEW_WindowProc;
   wndClass.cbClsExtra = 0;