From 0255c8f0dfa323c0b18b5e0e9a4c8058e71844f4 Mon Sep 17 00:00:00 2001 From: Ulrich Czekalla Date: Wed, 17 Jan 2001 01:48:14 +0000 Subject: [PATCH] Only adjust item rect by horizontal scrollbar offset in report view. --- dlls/comctl32/listview.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index f72f76e35ff..fdba7d733de 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -5309,10 +5309,18 @@ static BOOL LISTVIEW_GetItemPosition(HWND hwnd, INT nItem, } else if (uView == LVS_REPORT) { + SCROLLINFO scrollInfo; bResult = TRUE; lpptPosition->x = REPORT_MARGINX; lpptPosition->y = ((nItem - ListView_GetTopIndex(hwnd)) * infoPtr->nItemHeight) + infoPtr->rcList.top; + + /* Adjust position by scrollbar offset */ + ZeroMemory(&scrollInfo, sizeof(SCROLLINFO)); + scrollInfo.cbSize = sizeof(SCROLLINFO); + scrollInfo.fMask = SIF_POS; + GetScrollInfo(hwnd, SB_HORZ, &scrollInfo); + lpptPosition->x -= scrollInfo.nPos * LISTVIEW_SCROLL_DIV_SIZE; } else { @@ -5359,8 +5367,6 @@ static LRESULT LISTVIEW_GetItemRect(HWND hwnd, INT nItem, LPRECT lprc) INT nIndent; TEXTMETRICA tm; LVITEMA lvItem; - INT scrollOffset; - SCROLLINFO scrollInfo; TRACE("(hwnd=%x, nItem=%d, lprc=%p)\n", hwnd, nItem, lprc); @@ -5729,16 +5735,6 @@ static LRESULT LISTVIEW_GetItemRect(HWND hwnd, INT nItem, LPRECT lprc) } break; } - /* Adjust rectangle by scrollbar offset*/ - ZeroMemory(&scrollInfo, sizeof(SCROLLINFO)); - scrollInfo.cbSize = sizeof(SCROLLINFO); - scrollInfo.fMask = SIF_POS; - - GetScrollInfo(hwnd, SB_HORZ, &scrollInfo); - - scrollOffset = scrollInfo.nPos * LISTVIEW_SCROLL_DIV_SIZE; - lprc->left -= scrollOffset; - lprc->right -= scrollOffset; } } return bResult; -- 2.11.4.GIT