Skip to content

W
wine-winehq
Commit 67eb9744 authored by Daniel Jelinski's avatar Daniel Jelinski Committed by Alexandre Julliard
Browse files
Options

comctl32/listview: Fix calculating item height.

parent ead7c50b
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 7 deletions
dlls/comctl32/listview.c
View file @ 67eb9744
......@@ -2954,15 +2954,12 @@ static INT LISTVIEW_CalculateItemHeight(const LISTVIEW_INFO *infoPtr)
nItemHeight = infoPtr->iconSpacing.cy;
else
{
nItemHeight = infoPtr->ntmHeight;
if (infoPtr->uView == LV_VIEW_DETAILS && infoPtr->dwLvExStyle & LVS_EX_GRIDLINES)
nItemHeight++;
nItemHeight = infoPtr->ntmHeight;
if (infoPtr->himlState)
nItemHeight = max(nItemHeight, infoPtr->iconStateSize.cy);
if (infoPtr->himlSmall)
nItemHeight = max(nItemHeight, infoPtr->iconSize.cy);
if (infoPtr->himlState || infoPtr->himlSmall)
nItemHeight += HEIGHT_PADDING;
nItemHeight += HEIGHT_PADDING;
if (infoPtr->nMeasureItemHeight > 0)
nItemHeight = infoPtr->nMeasureItemHeight;
}
......
dlls/comctl32/tests/listview.c
View file @ 67eb9744
......@@ -2432,7 +2432,6 @@ static void test_subitem_rect(void)
expect(100, rect.left);
expect(250, rect.right);
todo_wine
expect(3, rect.top);
rect.left = LVIR_BOUNDS;
......@@ -2443,7 +2442,6 @@ todo_wine
expect(250, rect.left);
expect(450, rect.right);
todo_wine
expect(3, rect.top);
/* item LVS_REPORT padding isn't applied to subitems */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment