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:
Mark Jansen 2018-02-06 15:37:39 +03:00 committed by Alexandre Julliard
parent e00a2379fc
commit 71cf0a31d9
2 changed files with 2 additions and 2 deletions

View File

@ -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)))
max_cx += infoPtr->iconSize.cx;
max_cx += TRAILING_LABEL_PADDING;
if (nColumn == 0 && (infoPtr->dwLvExStyle & LVS_EX_CHECKBOXES))
max_cx += GetSystemMetrics(SM_CXSMICON);
}
/* autosize based on listview items width */

View File

@ -6298,7 +6298,6 @@ static void test_LVSCW_AUTOSIZE(void)
width2 = SendMessageA(hwnd, LVM_GETCOLUMNWIDTH, 0, 0);
ok(width2 > 0, "Unexpected column width %d.\n", width2);
todo_wine
ok(width2 > width, "Expected increased column width.\n");
/* Turn off checkboxes. */
@ -6310,7 +6309,6 @@ todo_wine
width = SendMessageA(hwnd, LVM_GETCOLUMNWIDTH, 0, 0);
ok(width > 0, "Unexpected column width %d.\n", width2);
todo_wine
ok(width2 > width, "Expected reduced column width.\n");
DestroyWindow(hwnd);