Skip to content

W
wine-winehq
Commit 1a84ca42 authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard
Browse files
Options

comctl32/listview: LVM_GETITEMRECT: don't offset to item position on LVS_REPORT…

comctl32/listview: LVM_GETITEMRECT: don't offset to item position on LVS_REPORT querying LVIR_BOUNDS.
parent 79ed5e0f
Show whitespace changes
Inline Side-by-side
Showing with 10 additions and 8 deletions
dlls/comctl32/listview.c
View file @ 1a84ca42
...@@ -5928,6 +5928,7 @@ static BOOL LISTVIEW_GetItemRect(const LISTVIEW_INFO *infoPtr, INT nItem, LPRECT ...@@ -5928,6 +5928,7 @@ static BOOL LISTVIEW_GetItemRect(const LISTVIEW_INFO *infoPtr, INT nItem, LPRECT
BOOL doLabel = TRUE, oversizedBox = FALSE; BOOL doLabel = TRUE, oversizedBox = FALSE;
POINT Position, Origin; POINT Position, Origin;
LVITEMW lvItem; LVITEMW lvItem;
INT type;
TRACE("(hwnd=%p, nItem=%d, lprc=%p)\n", infoPtr->hwndSelf, nItem, lprc); TRACE("(hwnd=%p, nItem=%d, lprc=%p)\n", infoPtr->hwndSelf, nItem, lprc);
...@@ -5962,6 +5963,7 @@ static BOOL LISTVIEW_GetItemRect(const LISTVIEW_INFO *infoPtr, INT nItem, LPRECT ...@@ -5962,6 +5963,7 @@ static BOOL LISTVIEW_GetItemRect(const LISTVIEW_INFO *infoPtr, INT nItem, LPRECT
lvItem.state = (oversizedBox ? LVIS_FOCUSED : 0); lvItem.state = (oversizedBox ? LVIS_FOCUSED : 0);
} }
type = lprc->left;
if (uView == LVS_REPORT && (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT) && lprc->left == LVIR_SELECTBOUNDS) if (uView == LVS_REPORT && (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT) && lprc->left == LVIR_SELECTBOUNDS)
lprc->left = LVIR_BOUNDS; lprc->left = LVIR_BOUNDS;
switch(lprc->left) switch(lprc->left)
...@@ -5987,6 +5989,9 @@ static BOOL LISTVIEW_GetItemRect(const LISTVIEW_INFO *infoPtr, INT nItem, LPRECT ...@@ -5987,6 +5989,9 @@ static BOOL LISTVIEW_GetItemRect(const LISTVIEW_INFO *infoPtr, INT nItem, LPRECT
return FALSE; return FALSE;
} }
if ((uView == LVS_REPORT) && (type == LVIR_BOUNDS))
OffsetRect(lprc, Origin.x, Origin.y);
else
OffsetRect(lprc, Position.x + Origin.x, Position.y + Origin.y); OffsetRect(lprc, Position.x + Origin.x, Position.y + Origin.y);
TRACE(" rect=%s\n", wine_dbgstr_rect(lprc)); TRACE(" rect=%s\n", wine_dbgstr_rect(lprc));
......
dlls/comctl32/tests/listview.c
View file @ 1a84ca42
...@@ -2590,11 +2590,9 @@ static void test_getitemrect(void) ...@@ -2590,11 +2590,9 @@ static void test_getitemrect(void)
r = SendMessage(hwnd, LVM_GETITEMRECT, 0, (LPARAM)&rect); r = SendMessage(hwnd, LVM_GETITEMRECT, 0, (LPARAM)&rect);
expect(TRUE, r); expect(TRUE, r);
/* zero width rectangle */ /* zero width rectangle with no padding */
todo_wine {
expect(0, rect.left); expect(0, rect.left);
expect(0, rect.right); todo_wine expect(0, rect.right);
}
insert_column(hwnd, 0); insert_column(hwnd, 0);
insert_column(hwnd, 1); insert_column(hwnd, 1);
...@@ -2615,9 +2613,8 @@ todo_wine { ...@@ -2615,9 +2613,8 @@ todo_wine {
expect(TRUE, r); expect(TRUE, r);
/* still no left padding */ /* still no left padding */
todo_wine {
expect(0, rect.left); expect(0, rect.left);
} expect(150, rect.right);
rect.left = LVIR_SELECTBOUNDS; rect.left = LVIR_SELECTBOUNDS;
rect.right = rect.top = rect.bottom = -1; rect.right = rect.top = rect.bottom = -1;
...@@ -2640,9 +2637,9 @@ todo_wine { ...@@ -2640,9 +2637,9 @@ todo_wine {
rect.right = rect.top = rect.bottom = -1; rect.right = rect.top = rect.bottom = -1;
r = SendMessage(hwnd, LVM_GETITEMRECT, 0, (LPARAM)&rect); r = SendMessage(hwnd, LVM_GETITEMRECT, 0, (LPARAM)&rect);
expect(TRUE, r); expect(TRUE, r);
todo_wine expect(0, rect.left); expect(0, rect.left);
/* just width sum */ /* just width sum */
todo_wine expect(150, rect.right); expect(150, rect.right);
rect.left = LVIR_SELECTBOUNDS; rect.left = LVIR_SELECTBOUNDS;
rect.right = rect.top = rect.bottom = -1; rect.right = rect.top = rect.bottom = -1;
......
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