Module: wine Branch: master Commit: 67eb9744d97cc6643cc448bc878589b3869085f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67eb9744d97cc6643cc448bc87...
Author: Daniel Jelinski djelinski1@gmail.com Date: Sat Jan 5 15:04:53 2013 +0100
comctl32/listview: Fix calculating item height.
---
dlls/comctl32/listview.c | 7 ++----- dlls/comctl32/tests/listview.c | 2 -- 2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 977bb18..dfa8d6e 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -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; } diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 0620afe..0a42dad 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -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 */