From 040ae7635a1bf719aad253fe5254a3127332725a Mon Sep 17 00:00:00 2001 From: Giannis Adamopoulos Date: Sat, 17 Jun 2017 07:43:52 +0000 Subject: [PATCH] [SHELL32] -CMenuBand: forward WM_WININICHANGE to CMenuToolbarBase so that when themes get enabled, the menu bar in explorer becomes flat immediately. svn path=/trunk/; revision=75072 --- reactos/dll/win32/shell32/shellmenu/CMenuBand.cpp | 7 +++++++ reactos/dll/win32/shell32/shellmenu/CMenuToolbars.cpp | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/reactos/dll/win32/shell32/shellmenu/CMenuBand.cpp b/reactos/dll/win32/shell32/shellmenu/CMenuBand.cpp index 1e87eac6d0f..78b10e3ef03 100644 --- a/reactos/dll/win32/shell32/shellmenu/CMenuBand.cpp +++ b/reactos/dll/win32/shell32/shellmenu/CMenuBand.cpp @@ -720,6 +720,13 @@ HRESULT STDMETHODCALLTYPE CMenuBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wPa BOOL bFlatMenus; SystemParametersInfo(SPI_GETFLATMENU, 0, &bFlatMenus, 0); AdjustForTheme(bFlatMenus); + + if (m_staticToolbar) + m_staticToolbar->OnWinEvent(hWnd, uMsg, wParam, lParam, theResult); + + if (m_SFToolbar) + m_SFToolbar->OnWinEvent(hWnd, uMsg, wParam, lParam, theResult); + return S_OK; } diff --git a/reactos/dll/win32/shell32/shellmenu/CMenuToolbars.cpp b/reactos/dll/win32/shell32/shellmenu/CMenuToolbars.cpp index 9a1a967cbb0..38f8b628a96 100644 --- a/reactos/dll/win32/shell32/shellmenu/CMenuToolbars.cpp +++ b/reactos/dll/win32/shell32/shellmenu/CMenuToolbars.cpp @@ -113,6 +113,11 @@ HRESULT CMenuToolbarBase::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM return S_OK; } return S_FALSE; + case WM_WININICHANGE: + if (wParam == SPI_SETFLATMENU) + { + SystemParametersInfo(SPI_GETFLATMENU, 0, &m_useFlatMenus, 0); + } } return S_FALSE; -- 2.17.1