Changeset 3285 for trunk/src

Timestamp:

Mar 31, 2000, 4:44:25 PM (25 years ago)

Author:

cbratschi

Message:

* empty log message *

Location:

trunk/src/comctl32

Files:

• listview.cpp (modified) (11 diffs)
• tooltips.cpp (modified) (2 diffs)
• treeview.cpp (modified) (15 diffs)

trunk/src/comctl32/listview.cpp

@@ -1 @@
-/*$Id: listview.cpp,v 1.9 2000-03-27 15:08:07 cbratschi Exp $*/
+/*$Id: listview.cpp,v 1.10 2000-03-31 14:44:20 cbratschi Exp $*/
 /*
  * Listview control
@@ -164 +164 @@
   if ((infoPtr->uView == LVS_REPORT) && !(infoPtr->dwStyle & LVS_NOCOLUMNHEADER))
   {
-    LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)LISTVIEW_GetInfoPtr(hwnd);
     RECT rect,rect2;
 
@@ -3557 +3556 @@
 static LRESULT LISTVIEW_GetExtendedListViewStyle(HWND hwnd)
 {
-    LISTVIEW_INFO *infoPtr;
+    LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd);
+
     /* make sure we can get the listview info */
-    if (!(infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd)))
-        return (0);
+    if (!infoPtr)
+      return (0);
     return (infoPtr->dwExStyle);
 }
@@ -4039 +4039 @@
 static LRESULT LISTVIEW_GetHotItem(HWND hwnd)
 {
-    LISTVIEW_INFO *infoPtr;
+    LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd);
+
     /* make sure we can get the listview info */
-    if (!(infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd)))
-        return (-1);
+    if (!infoPtr)
+      return (-1);
     return (infoPtr->nHotItem);
 }
@@ -5495 +5496 @@
 static LRESULT LISTVIEW_SetColumnWidth(HWND hwnd, INT iCol, INT cx)
 {
-    LISTVIEW_INFO *infoPtr;
+    LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd);
     HDITEMA hdi;
     LRESULT lret;
+
+    // make sure we can get the listview info
+    if (!infoPtr)
+        return (FALSE);
 
     // set column width only if in report mode
@@ -5503 +5508 @@
         return (FALSE);
 
-    // make sure we can get the listview info
-    if (!(infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd)))
-        return (FALSE);
     if (!infoPtr->hwndHeader) // make sure we have a header
         return (FALSE);
@@ -5542 +5544 @@
 static LRESULT LISTVIEW_SetExtendedListViewStyle(HWND hwnd, DWORD dwMask, DWORD dwStyle)
 {
-    LISTVIEW_INFO *infoPtr;
+    LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd);
     DWORD dwOldStyle;
+
     /* make sure we can get the listview info */
-    if (!(infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd)))
-        return (0);
+    if (!infoPtr)
+      return (0);
     /* store previous style */
     dwOldStyle = infoPtr->dwExStyle;
@@ -5570 +5573 @@
 static LRESULT LISTVIEW_SetHotItem(HWND hwnd, INT iIndex)
 {
-    LISTVIEW_INFO *infoPtr;
+    LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd);
     INT iOldIndex;
+
     /* make sure we can get the listview info */
-    if (!(infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd)))
+    if (!infoPtr)
         return (-1);
     /* store previous index */
@@ -5926 +5930 @@
   LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd);
   INT nOldIndex = infoPtr->nSelectionMark;
+
   infoPtr->nSelectionMark = nIndex;
   return nOldIndex;
@@ -7542 +7547 @@
 static LRESULT LISTVIEW_Command(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
+    LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd);
+
     switch (HIWORD(wParam))
     {
@@ -7550 +7557 @@
              */
             char buffer[1024];
-            LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)LISTVIEW_GetInfoPtr(hwnd);
             HDC           hdc      = GetDC(infoPtr->hwndEdit);
             HFONT         hFont, hOldFont = 0;

trunk/src/comctl32/tooltips.cpp

@@ -1 @@
-/* $Id: tooltips.cpp,v 1.6 2000-03-30 15:39:09 cbratschi Exp $ */
+/* $Id: tooltips.cpp,v 1.7 2000-03-31 14:44:23 cbratschi Exp $ */
 /*
  * Tool tip control
@@ -2084 +2084 @@
   if (infoPtr->nTrackTool > -1)
   {
-    DWORD code = 0;
-
-    switch (uMsg)
-    {
-      case WM_LBUTTONDOWN:
-        code = NM_CLICK;
-        break;
-
-      case WM_LBUTTONDBLCLK:
-        code = NM_DBLCLK;
-        break;
-
-      case WM_RBUTTONDOWN:
-        code = NM_RCLICK;
-        break;
-
-      case WM_RBUTTONDBLCLK:
-        code = NM_RDBLCLK;
-        break;
-    }
-
-    if (code)
-    {
-      TTTOOL_INFO *toolPtr = &infoPtr->tools[infoPtr->nTrackTool];
-      NMHDR hdr;
-
-      hdr.hwndFrom = hwnd;
-      hdr.idFrom = toolPtr->uId;
-      hdr.code = code;
-      SendMessageA(toolPtr->hwnd,WM_NOTIFY,(WPARAM)toolPtr->uId,(LPARAM)&hdr);
-    }
+    //CB: tocheck: tracking tool without TTF_TRANSPARENT style
   } else
   {

trunk/src/comctl32/treeview.cpp

@@ -1 @@
-/* $Id: treeview.cpp,v 1.5 2000-03-30 15:39:10 cbratschi Exp $ */
+/* $Id: treeview.cpp,v 1.6 2000-03-31 14:44:25 cbratschi Exp $ */
 /* Treeview control
  *
@@ -30 +30 @@
 */
 
-/* CB: todo
+/* CB: todo/bugs
+ - startup: missing WM_SIZE messages -> i.e. wrong info tip calculation
  - bug in SetScrollInfo/ShowScrollBar: WM_SIZE and WM_NCPAINT problems (i.e. RegEdit)
  - VK_LEFT in WinHlp32 displays expanded icon
@@ -84 +85 @@
 static VOID    TREEVIEW_ISearch(HWND hwnd,CHAR ch);
 static VOID    TREEVIEW_CheckInfoTip(HWND hwnd);
+static VOID TREEVIEW_HideInfoTip(HWND hwnd,TREEVIEW_INFO *infoPtr);
 
 static LRESULT CALLBACK TREEVIEW_Edit_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
@@ -1359 +1361 @@
   if (infoPtr->uInternalStatus & TV_CALCALL)
   {
+    TREEVIEW_HideInfoTip(hwnd,infoPtr);
     itemHeight = 0;
     ImageList_GetIconSize (infoPtr->himlNormal, &x, &itemHeight);
@@ -2784 +2787 @@
   infoPtr->hwndToolTip = 0;
   if (!(dwStyle & TVS_NOTOOLTIPS))
-    infoPtr->hwndToolTip = createToolTip(hwnd,TTF_TRACK | TTF_ABSOLUTE,TRUE);
+  {
+    infoPtr->hwndToolTip = createToolTip(hwnd,TTF_TRACK | TTF_ABSOLUTE | TTF_TRANSPARENT,TRUE);
+    SendMessageA(infoPtr->hwndToolTip,WM_SETFONT,infoPtr->hFont,0);
+  }
 
   if (dwStyle & TVS_CHECKBOXES)
@@ -3754 +3760 @@
 }
 
+HTREEITEM TREEVIEW_GetInfoTipItem(HWND hwnd,TREEVIEW_INFO *infoPtr,POINT pt)
+{
+  TVHITTESTINFO ht;
+
+  ht.pt = pt;
+  TREEVIEW_HitTest(hwnd,&ht,FALSE);
+
+  if (ht.hItem && (ht.flags & TVHT_ONITEM))
+  {
+    TREEVIEW_ITEM *item;
+
+    item = &infoPtr->items[(INT)ht.hItem];
+    if (item->visible && ((item->text.left < 0) || (item->text.right > infoPtr->uVisibleWidth)))
+      return ht.hItem;
+  }
+
+  //check tool rect -> no flickering on tip frame
+  if (infoPtr->tipItem)
+  {
+    POINT pt2 = pt;
+    RECT rect;
+
+    GetWindowRect(infoPtr->hwndToolTip,&rect);
+    ClientToScreen(hwnd,&pt2);
+    return PtInRect(&rect,pt2) ? infoPtr->tipItem:0;
+  }
+
+  return 0;
+}
+
 VOID TREEVIEW_ShowInfoTip(HWND hwnd,TREEVIEW_INFO *infoPtr,TREEVIEW_ITEM *item)
 {
@@ -3762 +3798 @@
   DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
 
-  if(dwStyle & TVS_INFOTIP)
+  if (dwStyle & TVS_INFOTIP)
   {
     NMTVGETINFOTIPW tvgit;
@@ -3800 +3836 @@
   ti.hinst    = 0;
   ti.lpszText = text;
+  SendMessageA(infoPtr->hwndToolTip,TTM_TRACKACTIVATE,(WPARAM)FALSE,(LPARAM)&ti);
   pt.x = item->text.left;
   pt.y = item->text.top;
@@ -3831 +3868 @@
 {
   TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
-  TVHITTESTINFO ht;
-
-  GetCursorPos(&ht.pt);
-  ScreenToClient(hwnd,&ht.pt);
-  TREEVIEW_HitTest(hwnd,&ht,TRUE);
-
-  if ((ht.hItem != infoPtr->tipItem) || !(ht.flags & TVHT_ONITEMLABEL))
+  HTREEITEM hItem;
+  POINT pt;
+
+  GetCursorPos(&pt);
+  ScreenToClient(hwnd,&pt);
+  hItem = TREEVIEW_GetInfoTipItem(hwnd,infoPtr,pt);
+
+  if (hItem != infoPtr->tipItem)
     TREEVIEW_HideInfoTip(hwnd,infoPtr);
 }
@@ -3844 +3882 @@
 {
   TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
-  TVHITTESTINFO ht;
-  TREEVIEW_ITEM *item;
-
-  ht.pt.x = (INT)LOWORD(lParam);
-  ht.pt.y = (INT)HIWORD(lParam);
-
-  TREEVIEW_HitTest(hwnd,&ht,FALSE);
-
-  if (ht.hItem)
-  {
-    DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
-
-    item = &infoPtr->items[(INT)ht.hItem];
-
-    if (infoPtr->hwndToolTip && (ht.flags & TVHT_ONITEMLABEL) &&
-        ((item->text.left < 0) || (item->text.right > infoPtr->uVisibleWidth) || (item->text.top < 0) || (item->text.bottom > infoPtr->uVisibleHeight)) &&
-        (infoPtr->tipItem != item->hItem))
-      TREEVIEW_ShowInfoTip(hwnd,infoPtr,item);
-    else
-      TREEVIEW_HideInfoTip(hwnd,infoPtr);
-
-    if (dwStyle & TVS_TRACKSELECT)
-    {
-      //CB: todo: hottracking
+  DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
+  POINT pt;
+
+  pt.x = (INT)LOWORD(lParam);
+  pt.y = (INT)HIWORD(lParam);
+
+  if (infoPtr->hwndToolTip)
+  {
+    HTREEITEM hItem = TREEVIEW_GetInfoTipItem(hwnd,infoPtr,pt);
+
+    if (infoPtr->tipItem != hItem)
+    {
+      if (hItem)
+      {
+        TREEVIEW_ITEM *item;
+
+        item = &infoPtr->items[(INT)hItem];
+        TREEVIEW_ShowInfoTip(hwnd,infoPtr,item);
+      } else TREEVIEW_HideInfoTip(hwnd,infoPtr);
     }
+  }
+
+  if (dwStyle & TVS_TRACKSELECT)
+  {
+    //CB: todo: hottracking
   }
 
@@ -4235 +4273 @@
   infoPtr->hBoldFont = CreateFontIndirectA (&logFont);
 
+  SendMessageA(infoPtr->hwndToolTip,WM_SETFONT,infoPtr->hFont,1);
   infoPtr->uInternalStatus |= TV_CALCALL;
   TREEVIEW_CalcItems(hwnd,0,infoPtr);
@@ -4295 +4334 @@
     INT scrollY = infoPtr->lefttop.y-newY;
 
+    TREEVIEW_HideInfoTip(hwnd,infoPtr);
     infoPtr->lefttop.y = newY;
     if (!TREEVIEW_UnqueueRefresh(hwnd,TRUE,TRUE))
@@ -4361 +4401 @@
   if (lastPos != infoPtr->lefttop.x)
   {
+    TREEVIEW_HideInfoTip(hwnd,infoPtr);
     if (!TREEVIEW_UnqueueRefresh(hwnd,TRUE,TRUE))
       TREEVIEW_CalcItems(hwnd,0,infoPtr);
@@ -4803 +4844 @@
 }
 
-static LRESULT TREEVIEW_Notify(HWND hwnd,WPARAM wParam,LPARAM lParam)
-{
-  TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
-  LPNMHDR hdr = (LPNMHDR)lParam;
-
-  if (hdr->hwndFrom == infoPtr->hwndToolTip)
-  {
-    LPARAM lp = (LPARAM)GetMessagePos();
-    POINT pt;
-
-    pt.x = (INT)LOWORD(lp);
-    pt.y = (INT)HIWORD(lp);
-    ScreenToClient(hwnd,&pt);
-    lp = MAKELONG(pt.x,pt.y);
-
-    if (hdr->code == (UINT)NM_CLICK)
-      TREEVIEW_LButtonDown(hwnd,0,lp);
-    else if (hdr->code == (UINT)NM_RCLICK)
-      TREEVIEW_RButtonDown(hwnd,0,lp);
-    else if (hdr->code == (UINT)NM_DBLCLK)
-      TREEVIEW_LButtonDoubleClick(hwnd,0,lp);
-    else if (hdr->code == (UINT)NM_RDBLCLK)
-      TREEVIEW_RButtonDoubleClick(hwnd,0,lp);
-  }
-
-  return 0;
-}
-
 static LRESULT WINAPI
 TREEVIEW_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
@@ -5024 +5037 @@
         case WM_RBUTTONDBLCLK:
           return TREEVIEW_RButtonDoubleClick(hwnd,wParam,lParam);
-
-        case WM_NOTIFY:
-          return TREEVIEW_Notify(hwnd,wParam,lParam);
 
         case WM_STYLECHANGED: