From 8374d47de5d278f4f82daa49ffc46490f6b47d80 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Wed, 19 Mar 2008 17:49:50 -0700 Subject: [PATCH] comctl32: fix listview redraw when deleting items --- dlls/comctl32/listview.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 706e92b..abe1470 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4642,8 +4642,9 @@ static void LISTVIEW_ScrollOnInsert(LISTVIEW_INFO *infoPtr, INT nItem, INT dir) */ static BOOL LISTVIEW_DeleteItem(LISTVIEW_INFO *infoPtr, INT nItem) { - UINT uView = infoPtr->dwStyle & LVS_TYPEMASK; LVITEMW item; + const UINT uView = infoPtr->dwStyle & LVS_TYPEMASK; + const BOOL is_icon = (uView == LVS_SMALLICON || uView == LVS_ICON); TRACE("(nItem=%d)\n", nItem); @@ -4658,7 +4659,7 @@ static BOOL LISTVIEW_DeleteItem(LISTVIEW_INFO *infoPtr, INT nItem) if (!notify_deleteitem(infoPtr, nItem)) return FALSE; /* we need to do this here, because we'll be deleting stuff */ - if (uView == LVS_SMALLICON || uView == LVS_ICON) + if (is_icon) LISTVIEW_InvalidateItem(infoPtr, nItem); if (!(infoPtr->dwStyle & LVS_OWNERDATA)) @@ -4677,7 +4678,7 @@ static BOOL LISTVIEW_DeleteItem(LISTVIEW_INFO *infoPtr, INT nItem) DPA_Destroy(hdpaSubItems); } - if (uView == LVS_SMALLICON || uView == LVS_ICON) + if (is_icon) { DPA_DeletePtr(infoPtr->hdpaPosX, nItem); DPA_DeletePtr(infoPtr->hdpaPosY, nItem); @@ -4687,7 +4688,8 @@ static BOOL LISTVIEW_DeleteItem(LISTVIEW_INFO *infoPtr, INT nItem) LISTVIEW_ShiftIndices(infoPtr, nItem, -1); /* now is the invalidation fun */ - LISTVIEW_ScrollOnInsert(infoPtr, nItem, -1); + if (!is_icon) + LISTVIEW_ScrollOnInsert(infoPtr, nItem, -1); return TRUE; } -- 1.5.2.5