ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

comctl32/listview: Revert item width calculation to fix performance issues.

This commit is contained in:
Nikolay Sivov 2010-02-08 17:52:45 +03:00 committed by Alexandre Julliard
parent 22434f490a
commit 057267d85e
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dlls/comctl32/listview.c
View File

@ -401,7 +401,7 @@ typedef struct tagLISTVIEW_INFO
#define MAX_EMPTYTEXT_SELECT_WIDTH 80 #define MAX_EMPTYTEXT_SELECT_WIDTH 80
/* default column width for items in list display mode */ /* default column width for items in list display mode */
#define DEFAULT_COLUMN_WIDTH 96 #define DEFAULT_COLUMN_WIDTH 128
/* Size of "line" scroll for V & H scrolls */ /* Size of "line" scroll for V & H scrolls */
#define LISTVIEW_SCROLL_ICON_LINE_SIZE 37 #define LISTVIEW_SCROLL_ICON_LINE_SIZE 37
@ -2808,7 +2808,6 @@ static INT LISTVIEW_CalculateItemWidth(const LISTVIEW_INFO *infoPtr)
{ {
WCHAR szDispText[DISP_TEXT_SIZE] = { '\0' }; WCHAR szDispText[DISP_TEXT_SIZE] = { '\0' };
LVITEMW lvItem; LVITEMW lvItem;
BOOL empty;
INT i; INT i;
lvItem.mask = LVIF_TEXT; lvItem.mask = LVIF_TEXT;
@ -2823,19 +2822,13 @@ static INT LISTVIEW_CalculateItemWidth(const LISTVIEW_INFO *infoPtr)
nItemWidth = max(LISTVIEW_GetStringWidthT(infoPtr, lvItem.pszText, TRUE), nItemWidth = max(LISTVIEW_GetStringWidthT(infoPtr, lvItem.pszText, TRUE),
nItemWidth); nItemWidth);
} }
empty = nItemWidth == 0;
if (infoPtr->himlSmall) nItemWidth += infoPtr->iconSize.cx; if (infoPtr->himlSmall) nItemWidth += infoPtr->iconSize.cx;
if (infoPtr->himlState) nItemWidth += infoPtr->iconStateSize.cx; if (infoPtr->himlState) nItemWidth += infoPtr->iconStateSize.cx;
if (empty) nItemWidth = max(DEFAULT_COLUMN_WIDTH, nItemWidth + WIDTH_PADDING);
nItemWidth = max(nItemWidth, DEFAULT_COLUMN_WIDTH);
else
nItemWidth += WIDTH_PADDING;
} }
TRACE("nItemWidth=%d\n", nItemWidth);
return nItemWidth; return nItemWidth;
} }
@ -7480,7 +7473,7 @@ static INT LISTVIEW_InsertItemT(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem,
TRACE(" inserting at %d, sorted=%d, count=%d, iItem=%d\n", nItem, is_sorted, infoPtr->nItemCount, lpLVItem->iItem); TRACE(" inserting at %d, sorted=%d, count=%d, iItem=%d\n", nItem, is_sorted, infoPtr->nItemCount, lpLVItem->iItem);
nItem = DPA_InsertPtr( infoPtr->hdpaItems, nItem, hdpaSubItems ); nItem = DPA_InsertPtr( infoPtr->hdpaItems, nItem, hdpaSubItems );
if (nItem == -1) goto fail; if (nItem == -1) goto fail;
if (++infoPtr->nItemCount > 0) LISTVIEW_UpdateItemSize(infoPtr); infoPtr->nItemCount++;
/* shift indices first so they don't get tangled */ /* shift indices first so they don't get tangled */
LISTVIEW_ShiftIndices(infoPtr, nItem, 1); LISTVIEW_ShiftIndices(infoPtr, nItem, 1);

2
dlls/comctl32/tests/listview.c
View File

@ -3967,7 +3967,7 @@ static void test_getcolumnwidth(void)
memset(&itema, 0, sizeof(itema)); memset(&itema, 0, sizeof(itema));
SendMessage(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&itema); SendMessage(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&itema);
ret = SendMessage(hwnd, LVM_GETCOLUMNWIDTH, 0, 0); ret = SendMessage(hwnd, LVM_GETCOLUMNWIDTH, 0, 0);
expect(96, ret); todo_wine expect(96, ret);
DestroyWindow(hwnd); DestroyWindow(hwnd);
} }