Skip to content

W
wine-cw
Commit 1db182f2 authored by Serge Ivanov's avatar Serge Ivanov Committed by Alexandre Julliard
Browse files
Options

Added proper handling TVIS_OVERLAYMASK flag and allows to display

overlay images. Fixed off by one error with listitem in TREEVIEW_InsertItemA (uNumItems is 0 based, cChildren is a count).
parent f19f07d5
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 9 deletions
dlls/comctl32/treeview.c
View file @ 1db182f2
......@@ -757,13 +757,18 @@ TREEVIEW_DrawItem (HWND hwnd, HDC hdc, TREEVIEW_ITEM *wineItem)
if (himlp)
{
ImageList_Draw ( *himlp, imageIndex, hdc, xpos-2, r.top+1, ILD_NORMAL);
ImageList_GetIconSize (*himlp, &cx, &cy);
wineItem->bitmap.left=xpos-2;
wineItem->bitmap.right=xpos-2+cx;
wineItem->bitmap.top=r.top+1;
wineItem->bitmap.bottom=r.top+1+cy;
xpos+=cx;
int ovlIdx = 0;
if(wineItem->stateMask & TVIS_OVERLAYMASK)
ovlIdx = wineItem->state & TVIS_OVERLAYMASK;
ImageList_Draw ( *himlp, imageIndex, hdc, xpos-2, r.top+1, ILD_NORMAL|ovlIdx);
ImageList_GetIconSize (*himlp, &cx, &cy);
wineItem->bitmap.left=xpos-2;
wineItem->bitmap.right=xpos-2+cx;
wineItem->bitmap.top=r.top+1;
wineItem->bitmap.bottom=r.top+1+cy;
xpos+=cx;
}
}
......@@ -1773,8 +1778,8 @@ TREEVIEW_InsertItemA (HWND hwnd, WPARAM wParam, LPARAM lParam)
wineItem->parent = ptdi->hParent;
sibItem = &infoPtr->items [(INT)parentItem->firstChild];
parentItem->cChildren++;
listItems = parentItem->cChildren;
parentItem->cChildren++;
}
......@@ -1814,7 +1819,7 @@ TREEVIEW_InsertItemA (HWND hwnd, WPARAM wParam, LPARAM lParam)
wineItem->firstChild=0;
wineItem->hItem=(HTREEITEM)iItem;
if (listItems>1) {
if (listItems!=0) {
prevsib=NULL;
switch ((DWORD) ptdi->hInsertAfter) {
......
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