AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Windows QPA: Highlight the first entry in the system menu

Browse Source 
This is what native Win32 applications usually do.

Pick-to: 6.3 6.2
Change-Id: I19f1170113b4064f1d683dbd13b7de7d263105f0
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: André de la Rocha <andre.rocha@qt.io>
This commit is contained in:
Yuhang Zhao 2022-02-07 17:48:00 +08:00
parent 56fa390d72
commit 64d65a645c
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/platforms/windows/qwindowskeymapper.cpp
View File

@ -800,7 +800,6 @@ static void showSystemMenu(QWindow* w)
bool maximized = IsZoomed(topLevelHwnd);
EnableMenuItem(menu, SC_MAXIMIZE, ! (topLevel->flags() & Qt::WindowMaximizeButtonHint) || maximized?disabled:enabled);
EnableMenuItem(menu, SC_RESTORE, maximized?enabled:disabled);
// We should _not_ check with the setFixedSize(x,y) case here, since Windows is not able to check
// this and our menu here would be out-of-sync with the menu produced by mouse-click on the
@ -808,6 +807,15 @@ static void showSystemMenu(QWindow* w)
EnableMenuItem(menu, SC_SIZE, (topLevel->flags() & Qt::MSWindowsFixedSizeDialogHint) || maximized?disabled:enabled);
EnableMenuItem(menu, SC_MOVE, maximized?disabled:enabled);
EnableMenuItem(menu, SC_CLOSE, enabled);
// Highlight the first entry in the menu, this is what native Win32 applications usually do.
MENUITEMINFOW restoreItem;
SecureZeroMemory(&restoreItem, sizeof(restoreItem));
restoreItem.cbSize = sizeof(restoreItem);
restoreItem.fMask = MIIM_STATE;
restoreItem.fState = MFS_HILITE | (maximized ? MFS_ENABLED : MFS_GRAYED);
SetMenuItemInfoW(menu, SC_RESTORE, FALSE, &restoreItem);
// Set bold on close menu item
MENUITEMINFO closeItem;
closeItem.cbSize = sizeof(MENUITEMINFO);