comctl32/listview: Fix subitem drawing.

lpColumnInfo->fmt & LVCFMT_IMAGE is supposed to mean that header item has an image. It is not supposed to mean that all items in that column should reserve space for an icon if they don't have any.

comctl32/listview: Fix subitem drawing.
8257ab9a · Daniel Jelinski · Alexandre Julliard · 9b8e3ca4 · 8257ab9a
Commit 8257ab9a authored Jan 05, 2013 by Daniel Jelinski Committed by Alexandre Julliard Jan 07, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

listview.c dlls/comctl32/listview.c +1 -1

No files found.
--- a/dlls/comctl32/listview.c
+++ b/dlls/comctl32/listview.c
@@ -2363,7 +2363,7 @@ static void LISTVIEW_GetItemMetrics(const LISTVIEW_INFO *infoPtr, const LVITEMW 
 	    Icon.top    = Box.top;
 	    Icon.right  = Icon.left;
 	    if (infoPtr->himlSmall &&
-                (!lpColumnInfo || lpLVItem->iSubItem == 0 || (lpColumnInfo->fmt & LVCFMT_IMAGE) ||
+                (!lpColumnInfo || lpLVItem->iSubItem == 0 ||
                 ((infoPtr->dwLvExStyle & LVS_EX_SUBITEMIMAGES) && lpLVItem->iImage != I_IMAGECALLBACK)))
 		Icon.right += infoPtr->iconSize.cx;
 	    Icon.bottom = Icon.top + infoPtr->iconSize.cy;