Changeset 3520 for trunk/src

Timestamp:

May 10, 2000, 9:50:33 PM (25 years ago)

Author:

cbratschi

Message:

treeview item height fix

Location:

trunk/src/comctl32

Files:

• listview.cpp (modified) (2 diffs)
• treeview.cpp (modified) (2 diffs)

trunk/src/comctl32/listview.cpp

@@ -1 @@
-/*$Id: listview.cpp,v 1.17 2000-04-18 16:02:37 cbratschi Exp $*/
+/*$Id: listview.cpp,v 1.18 2000-05-10 19:50:32 cbratschi Exp $*/
 /*
  * Listview control
@@ -12 +12 @@
  *
  * TODO:
+ *   - mouse selection
+ *   - DrawText with end ellipsis
  *   - Hot item handling.
  *   - rcView and origin (need testcase!!!)

trunk/src/comctl32/treeview.cpp

@@ -1 @@
-/* $Id: treeview.cpp,v 1.12 2000-04-17 17:04:14 cbratschi Exp $ */
+/* $Id: treeview.cpp,v 1.13 2000-05-10 19:50:33 cbratschi Exp $ */
 /* Treeview control
  *
@@ -1375 +1375 @@
     TREEVIEW_HideInfoTip(hwnd,infoPtr);
     itemHeight = 0;
-    ImageList_GetIconSize (infoPtr->himlNormal, &x, &itemHeight);
-    itemHeight = MAX(infoPtr->uItemHeight,itemHeight);
+    ImageList_GetIconSize(infoPtr->himlNormal,&x,&itemHeight);
+    if (infoPtr->uItemHeight != -1) itemHeight = MAX(infoPtr->uItemHeight,itemHeight);
 
     if (!hdc)