From 9f87939d2e004fc8b57706708d466ec97c579477 Mon Sep 17 00:00:00 2001 From: Yuhang Zhao <2546789017@qq.com> Date: Fri, 2 Sep 2022 22:12:48 +0800 Subject: [PATCH] QWindowsKeyMapper: simplify the code a bit (1/2) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use HiliteMenuItem() can do the same thing but code less. Change-Id: I53510668a9bed25bdb7db8a0225a165322b8959c Reviewed-by: Mårten Nordheim --- src/plugins/platforms/windows/qwindowskeymapper.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/plugins/platforms/windows/qwindowskeymapper.cpp b/src/plugins/platforms/windows/qwindowskeymapper.cpp index 6a6d8ac5a9..5aa13168bd 100644 --- a/src/plugins/platforms/windows/qwindowskeymapper.cpp +++ b/src/plugins/platforms/windows/qwindowskeymapper.cpp @@ -792,14 +792,10 @@ 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); + EnableMenuItem(menu, SC_RESTORE, maximized ? enabled : disabled); // 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); + HiliteMenuItem(topLevelHwnd, menu, SC_RESTORE, MF_BYCOMMAND | MFS_HILITE); // Set bold on close menu item MENUITEMINFO closeItem;