Fix 3-dot menu not losing focus after clicking outside (Windows). Related to MM-46424 (#2242)

This commit is contained in:
Tasos Boulis
2022-10-12 18:04:15 +03:00
committed by GitHub
parent be13c231b6
commit 9f7a96e794
6 changed files with 40 additions and 19 deletions

View File

@@ -35,6 +35,7 @@ import {
START_UPDATE_DOWNLOAD,
PING_DOMAIN,
MAIN_WINDOW_SHOWN,
OPEN_APP_MENU,
} from 'common/communication';
import Config from 'common/config';
import urlUtils from 'common/utils/url';
@@ -236,7 +237,7 @@ function initializeInterCommunicationEventListeners() {
ipcMain.on(UPDATE_LAST_ACTIVE, handleUpdateLastActive);
if (process.platform !== 'darwin') {
ipcMain.on('open-app-menu', handleOpenAppMenu);
ipcMain.on(OPEN_APP_MENU, handleOpenAppMenu);
}
ipcMain.on(SWITCH_SERVER, handleSwitchServer);

View File

@@ -18,6 +18,7 @@ import {MattermostServer} from 'common/servers/MattermostServer';
import {TAB_FOCALBOARD, TAB_MESSAGING, TAB_PLAYBOOKS} from 'common/tabs/TabView';
import urlUtils from 'common/utils/url';
import Utils from 'common/utils/util';
import {APP_MENU_WILL_CLOSE} from 'common/communication';
import updateManager from 'main/autoUpdater';
import {migrationInfoPath, updatePaths} from 'main/constants';
@@ -96,7 +97,10 @@ export function handleUpdateMenuEvent() {
const aMenu = createAppMenu(Config, updateManager);
Menu.setApplicationMenu(aMenu);
aMenu.addListener('menu-will-close', WindowManager.focusBrowserView);
aMenu.addListener('menu-will-close', () => {
WindowManager.focusBrowserView();
WindowManager.sendToRenderer(APP_MENU_WILL_CLOSE);
});
// set up context menu for tray icon
if (shouldShowTrayIcon()) {