Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 20:53:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

[EXPLORER] Start menu: Fix Small Icons flag (#6651)

Browse source 
Follow-up to #6646.
Fix wrong flag use: #6646 (comment)
JIRA issue: CORE-19494
- Delete SmallStartMenu flag (wrong) from
  _TW_STUCKRECTS2.
- Rename _TW_STUCKRECTS2.SmallIcons as
  SmSmallIcons.
- Use SmSmallIcons flag.
This commit is contained in:
Katayama Hirofumi MZ 2024-03-22 21:15:22 +09:00 • committed by GitHub
parent 2ec785b1ee
commit 17b0623cf8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 33 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

18
base/shell/explorer/traywnd.cpp
View file

@ -2554,9 +2554,9 @@ ChangePos:
RegLoadSettings();
/* Create and initialize the start menu */
BOOL bSmallStartMenu = g_TaskbarSettings.sr.SmallStartMenu;
HBITMAP hbmBanner = LoadBitmapW(hExplorerInstance, MAKEINTRESOURCEW(IDB_STARTMENU));
m_StartMenuPopup = CreateStartMenu(this, &m_StartMenuBand, hbmBanner, bSmallStartMenu);
m_StartMenuPopup = CreateStartMenu(this, &m_StartMenuBand, hbmBanner,
g_TaskbarSettings.sr.SmSmallIcons);
/* Create the task band */
hRet = CTaskBand_CreateInstance(this, m_StartButton.m_hWnd, IID_PPV_ARG(IDeskBand, &m_TaskBand));
@ -2661,13 +2661,19 @@ ChangePos:
if (m_StartMenuPopup && lstrcmpiW((LPCWSTR)lParam, L"TraySettings") == 0)
{
/* Re-create the start menu */
HideStartMenu();
m_StartMenuBand.Release();
BOOL bSmallStartMenu = g_TaskbarSettings.sr.SmallStartMenu;
HBITMAP hbmBanner = LoadBitmapW(hExplorerInstance, MAKEINTRESOURCEW(IDB_STARTMENU));
m_StartMenuPopup = CreateStartMenu(this, &m_StartMenuBand, hbmBanner, bSmallStartMenu);
#if 1 // FIXME: Please re-use the start menu
/* Re-create the start menu */
m_StartMenuBand.Release();
m_StartMenuPopup = CreateStartMenu(this, &m_StartMenuBand, hbmBanner,
g_TaskbarSettings.sr.SmSmallIcons);
FIXME("Use UpdateStartMenu\n");
#else
// Update the start menu
UpdateStartMenu(m_StartMenuPopup, hbmBanner, g_TaskbarSettings.sr.SmSmallIcons, TRUE);
#endif
}
return 0;