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

comctl32/listview: Implement callback functionality for item indentation.

This commit is contained in:
Nikolay Sivov 2009-06-10 03:23:17 +04:00 committed by Alexandre Julliard
parent 5e5a58b138
commit abe5dee0bb
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dlls/comctl32/listview.c
View File

@ -6,6 +6,7 @@
* Copyright 2000 Jason Mawdsley * Copyright 2000 Jason Mawdsley
* Copyright 2001 CodeWeavers Inc. * Copyright 2001 CodeWeavers Inc.
* Copyright 2002 Dimitrie O. Paun * Copyright 2002 Dimitrie O. Paun
* Copyright 2009 Nikolay Sivov
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
@ -5746,6 +5747,14 @@ static BOOL LISTVIEW_GetItemT(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVItem,
dispInfo.item.iImage = I_IMAGECALLBACK; dispInfo.item.iImage = I_IMAGECALLBACK;
} }
/* Only items support indentation */
if ((lpLVItem->mask & LVIF_INDENT) && lpItem->iIndent == I_INDENTCALLBACK &&
(isubitem == 0))
{
dispInfo.item.mask |= LVIF_INDENT;
dispInfo.item.iIndent = I_INDENTCALLBACK;
}
/* Apps depend on calling back for text if it is NULL or LPSTR_TEXTCALLBACKW */ /* Apps depend on calling back for text if it is NULL or LPSTR_TEXTCALLBACKW */
if ((lpLVItem->mask & LVIF_TEXT) && !(lpLVItem->mask & LVIF_NORECOMPUTE) && if ((lpLVItem->mask & LVIF_TEXT) && !(lpLVItem->mask & LVIF_NORECOMPUTE) &&
!is_textW(pItemHdr->pszText)) !is_textW(pItemHdr->pszText))
@ -5837,8 +5846,16 @@ static BOOL LISTVIEW_GetItemT(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVItem,
} }
/* and last, but not least, the indent field */ /* and last, but not least, the indent field */
if (lpLVItem->mask & LVIF_INDENT) if (dispInfo.item.mask & LVIF_INDENT)
{
lpLVItem->iIndent = dispInfo.item.iIndent;
if ((dispInfo.item.mask & LVIF_DI_SETITEM) && lpItem->iIndent == I_INDENTCALLBACK)
lpItem->iIndent = dispInfo.item.iIndent;
}
else if (lpLVItem->mask & LVIF_INDENT)
{
lpLVItem->iIndent = lpItem->iIndent; lpLVItem->iIndent = lpItem->iIndent;
}
return TRUE; return TRUE;
} }

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

@ -3304,7 +3304,7 @@ static void test_indentation(void)
expect(TRUE, r); expect(TRUE, r);
ok_sequence(sequences, PARENT_SEQ_INDEX, single_getdispinfo_parent_seq, ok_sequence(sequences, PARENT_SEQ_INDEX, single_getdispinfo_parent_seq,
"get indent dispinfo", TRUE); "get indent dispinfo", FALSE);
DestroyWindow(hwnd); DestroyWindow(hwnd);
} }