Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-07 13:13:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHELL32] Coalesce DefView item changed statusbar updates (#6862)

Browse source 
Updating the statusbar on every LVN_ITEMCHANGED causes a massive delay when the number of changed items is large, very noticeable on Ctrl+A.

CORE-18663
This commit is contained in:
Whindmar Saksit 2024-05-14 13:21:30 +02:00 • committed by GitHub
parent 1a162375f9
commit a0776922f4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

22
dll/win32/shell32/CDefView.cpp
View file

@ -48,7 +48,8 @@ typedef struct
INT nLastHeaderID; INT nLastHeaderID;
} LISTVIEW_SORT_INFO, *LPLISTVIEW_SORT_INFO; } LISTVIEW_SORT_INFO, *LPLISTVIEW_SORT_INFO;
#define SHV_CHANGE_NOTIFY WM_USER + 0x1111 #define SHV_CHANGE_NOTIFY (WM_USER + 0x1111)
#define SHV_UPDATESTATUSBAR (WM_USER + 0x1112)
// For the context menu of the def view, the id of the items are based on 1 because we need // For the context menu of the def view, the id of the items are based on 1 because we need
// to call TrackPopupMenu and let it use the 0 value as an indication that the menu was canceled // to call TrackPopupMenu and let it use the 0 value as an indication that the menu was canceled
@ -160,6 +161,7 @@ private:
BOOL m_isEditing; BOOL m_isEditing;
BOOL m_isParentFolderSpecial; BOOL m_isParentFolderSpecial;
bool m_ScheduledStatusbarUpdate;
CLSID m_Category; CLSID m_Category;
BOOL m_Destroyed; BOOL m_Destroyed;
@ -339,6 +341,7 @@ public:
LRESULT OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled);
LRESULT OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled);
LRESULT OnChangeNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnChangeNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled);
LRESULT OnUpdateStatusbar(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled);
LRESULT OnCustomItem(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnCustomItem(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled);
LRESULT OnSettingChange(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnSettingChange(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled);
LRESULT OnInitMenuPopup(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnInitMenuPopup(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled);
@ -386,6 +389,7 @@ public:
MESSAGE_HANDLER(WM_NOTIFY, OnNotify) MESSAGE_HANDLER(WM_NOTIFY, OnNotify)
MESSAGE_HANDLER(WM_COMMAND, OnCommand) MESSAGE_HANDLER(WM_COMMAND, OnCommand)
MESSAGE_HANDLER(SHV_CHANGE_NOTIFY, OnChangeNotify) MESSAGE_HANDLER(SHV_CHANGE_NOTIFY, OnChangeNotify)
MESSAGE_HANDLER(SHV_UPDATESTATUSBAR, OnUpdateStatusbar)
MESSAGE_HANDLER(WM_CONTEXTMENU, OnContextMenu) MESSAGE_HANDLER(WM_CONTEXTMENU, OnContextMenu)
MESSAGE_HANDLER(WM_DRAWITEM, OnCustomItem) MESSAGE_HANDLER(WM_DRAWITEM, OnCustomItem)
MESSAGE_HANDLER(WM_MEASUREITEM, OnCustomItem) MESSAGE_HANDLER(WM_MEASUREITEM, OnCustomItem)
@ -451,6 +455,7 @@ CDefView::CDefView() :
m_cScrollDelay(0), m_cScrollDelay(0),
m_isEditing(FALSE), m_isEditing(FALSE),
m_isParentFolderSpecial(FALSE), m_isParentFolderSpecial(FALSE),
m_ScheduledStatusbarUpdate(false),
m_Destroyed(FALSE) m_Destroyed(FALSE)
{ {
ZeroMemory(&m_FolderSettings, sizeof(m_FolderSettings)); ZeroMemory(&m_FolderSettings, sizeof(m_FolderSettings));
@ -587,7 +592,7 @@ void CDefView::UpdateStatusbar()
// Don't bother with the extra processing if we only have one StatusBar part // Don't bother with the extra processing if we only have one StatusBar part
if (!m_isParentFolderSpecial) if (!m_isParentFolderSpecial)
{ {
DWORD uTotalFileSize = 0; UINT64 uTotalFileSize = 0;
WORD uFileFlags = LVNI_ALL; WORD uFileFlags = LVNI_ALL;
LPARAM pIcon = NULL; LPARAM pIcon = NULL;
INT nItem = -1; INT nItem = -1;
@ -636,6 +641,13 @@ void CDefView::UpdateStatusbar()
} }
} }
LRESULT CDefView::OnUpdateStatusbar(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled)
{
m_ScheduledStatusbarUpdate = false;
UpdateStatusbar();
return 0;
}
// ##### helperfunctions for initializing the view ##### // ##### helperfunctions for initializing the view #####
@ -2114,7 +2126,11 @@ LRESULT CDefView::OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandl
case LVN_ITEMCHANGED: case LVN_ITEMCHANGED:
TRACE("-- LVN_ITEMCHANGED %p\n", this); TRACE("-- LVN_ITEMCHANGED %p\n", this);
OnStateChange(CDBOSC_SELCHANGE); // browser will get the IDataObject OnStateChange(CDBOSC_SELCHANGE); // browser will get the IDataObject
UpdateStatusbar(); if (!m_ScheduledStatusbarUpdate)
{
m_ScheduledStatusbarUpdate = true;
PostMessage(SHV_UPDATESTATUSBAR, 0, 0);
}
_DoFolderViewCB(SFVM_SELECTIONCHANGED, NULL/* FIXME */, NULL/* FIXME */); _DoFolderViewCB(SFVM_SELECTIONCHANGED, NULL/* FIXME */, NULL/* FIXME */);
break; break;
case LVN_BEGINDRAG: case LVN_BEGINDRAG: