comctl32/listview: Include the checkbox in column width calculation.
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
e00a2379fc
commit
71cf0a31d9
|
@ -8406,6 +8406,8 @@ static BOOL LISTVIEW_SetColumnWidth(LISTVIEW_INFO *infoPtr, INT nColumn, INT cx)
|
||||||
if (infoPtr->himlSmall && (nColumn == 0 || (LISTVIEW_GetColumnInfo(infoPtr, nColumn)->fmt & LVCFMT_IMAGE)))
|
if (infoPtr->himlSmall && (nColumn == 0 || (LISTVIEW_GetColumnInfo(infoPtr, nColumn)->fmt & LVCFMT_IMAGE)))
|
||||||
max_cx += infoPtr->iconSize.cx;
|
max_cx += infoPtr->iconSize.cx;
|
||||||
max_cx += TRAILING_LABEL_PADDING;
|
max_cx += TRAILING_LABEL_PADDING;
|
||||||
|
if (nColumn == 0 && (infoPtr->dwLvExStyle & LVS_EX_CHECKBOXES))
|
||||||
|
max_cx += GetSystemMetrics(SM_CXSMICON);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* autosize based on listview items width */
|
/* autosize based on listview items width */
|
||||||
|
|
|
@ -6298,7 +6298,6 @@ static void test_LVSCW_AUTOSIZE(void)
|
||||||
|
|
||||||
width2 = SendMessageA(hwnd, LVM_GETCOLUMNWIDTH, 0, 0);
|
width2 = SendMessageA(hwnd, LVM_GETCOLUMNWIDTH, 0, 0);
|
||||||
ok(width2 > 0, "Unexpected column width %d.\n", width2);
|
ok(width2 > 0, "Unexpected column width %d.\n", width2);
|
||||||
todo_wine
|
|
||||||
ok(width2 > width, "Expected increased column width.\n");
|
ok(width2 > width, "Expected increased column width.\n");
|
||||||
|
|
||||||
/* Turn off checkboxes. */
|
/* Turn off checkboxes. */
|
||||||
|
@ -6310,7 +6309,6 @@ todo_wine
|
||||||
|
|
||||||
width = SendMessageA(hwnd, LVM_GETCOLUMNWIDTH, 0, 0);
|
width = SendMessageA(hwnd, LVM_GETCOLUMNWIDTH, 0, 0);
|
||||||
ok(width > 0, "Unexpected column width %d.\n", width2);
|
ok(width > 0, "Unexpected column width %d.\n", width2);
|
||||||
todo_wine
|
|
||||||
ok(width2 > width, "Expected reduced column width.\n");
|
ok(width2 > width, "Expected reduced column width.\n");
|
||||||
|
|
||||||
DestroyWindow(hwnd);
|
DestroyWindow(hwnd);
|
||||||
|
|
Loading…
Reference in New Issue