alt+tab in desktop fix: drops menu focus now (#9644)

Signed-off-by: Denis Gladkiy <[email protected]>

Author: GeneralGDA

desktop/src/main/start.ts

@@ -273,6 +273,10 @@ const createWindow = async (): Promise<void> => {
     mainWindow?.webContents.send('window-state-changed', maximized ? 'maximized' : 'unmaximized')
   }
 
+  mainWindow.on('blur', () => {
+    mainWindow?.webContents.send('window-focus-loss')
+  });
+
   mainWindow.on('maximize', () => {
     sendWindowMaximizedMessage(true)
   });
@@ -309,8 +313,18 @@ function sendCommand(cmd: string, ...args: any[]): void {
   mainWindow?.webContents.send(cmd, ...args)
 }
 
+function activateWindow (): void {
+  if (mainWindow) {
+    if (mainWindow.isMinimized()) {
+      mainWindow.restore()
+    }
+    mainWindow.show()
+    mainWindow.focus()
+  }
+}
+
 if (isWindows) {
-  setupWindowsSpecific(sendCommand)
+  setupWindowsSpecific(activateWindow, sendCommand)
 } else {
   addMenus(sendCommand)
 }

desktop/src/main/windowsSpecificSetup.ts

@@ -27,7 +27,7 @@ type JumpCommand = typeof JUMP_COMMANDS[keyof typeof JUMP_COMMANDS]
 const JUMP_TO_APP_COMMAND_PREFIX = '--jump-to-app='
 
 function getIconPath(iconName: string): string {
-    return path.join(process.resourcesPath, 'icons', iconName);
+    return path.join(process.resourcesPath, 'icons', iconName)
 }
 
 function addFixedFunctionJumpListItems(spares: JumpListSpares, tasks: JumpListItem[]): void {
@@ -61,55 +61,59 @@ export function rebuildJumpList(spares: JumpListSpares): void {
     }
 
     for (const application of spares.applications) {
+        const iconFileName = application.id.replaceAll(":", "_") + '.ico'
+        const cliArguments = `${JUMP_TO_APP_COMMAND_PREFIX}${application.alias}`
         tasks.push({
             type: 'task',
             program: process.execPath,
-            args: `${JUMP_TO_APP_COMMAND_PREFIX}${application.alias}`,
-            iconPath: getIconPath(application.id.replaceAll(":", "_") + '.ico'),
+            args: cliArguments,
+            iconPath: getIconPath(iconFileName),
             title: application.title,
             iconIndex: 0,
-        });
+        })
     }
 
     const category: JumpListCategory = {
         type: 'tasks',
         items: tasks,
     }
 
-    app.setJumpList([category]);
+    app.setJumpList([category])
 }
 
-export function setupWindowsSpecific(sendCommand: (cmd: Command, ...args: any[]) => void): void {
+export function setupWindowsSpecific(activateWindow: () => void, sendCommand: (cmd: Command, ...args: any[]) => void): void {
 
-    app.setAppUserModelId(app.getName());
+    app.setAppUserModelId(app.getName())
 
     app.on('second-instance', (_event: any, commandLine: any, _workingDirectory: any) => {
-        const commandArgument = commandLine[1] as string;
+        const commandArgument = commandLine[1] as string
         if (typeof commandArgument === 'string' && commandArgument.startsWith(JUMP_TO_APP_COMMAND_PREFIX)) {
-            const applicationId = commandArgument.replace(JUMP_TO_APP_COMMAND_PREFIX, '');
-            sendCommand(CommandOpenApplication, [applicationId]);
-            return;
-        }
-        
-        const jumpCommandCode = commandArgument as JumpCommand;
-        let command: Command | undefined;
-        switch (jumpCommandCode) {
-            case JUMP_COMMANDS.INBOX:
-                command = CommandOpenInbox;
-                break;
-            case JUMP_COMMANDS.SETTINGS:
-                command = CommandOpenSettings;
-                break;
-            default: {
-                // compile-time check: if jumpCommand is not a known value, this line errors
-                const _exhaustive: never = jumpCommandCode;
-                return; // or handle error
+            const applicationId = commandArgument.replace(JUMP_TO_APP_COMMAND_PREFIX, '')
+            sendCommand(CommandOpenApplication, [applicationId])
+            
+        } else {
+            const jumpCommandCode = commandArgument as JumpCommand
+            let command: Command | undefined
+            switch (jumpCommandCode) {
+                case JUMP_COMMANDS.INBOX:
+                    command = CommandOpenInbox
+                    break;
+                case JUMP_COMMANDS.SETTINGS:
+                    command = CommandOpenSettings
+                    break;
+                default: {
+                    // compile-time check: if jumpCommand is not a known value, this line errors
+                    const _exhaustive: never = jumpCommandCode
+                    return; // or handle error
+                }
+            }
+            
+            if (command) {
+                sendCommand(command)
             }
         }
-        
-        if (command) {
-            sendCommand(command);
-        }
+
+        activateWindow()
     })
 
 }

desktop/src/ui/preload.ts

@@ -78,6 +78,10 @@ const expose: IPCMainExposed = {
     ipcRenderer.on('window-state-changed', callback)
   },
 
+  onWindowFocusLoss: (callback) => {
+    ipcRenderer.on('window-focus-loss', callback)
+  },
+
   isOsUsingDarkTheme: async ()  =>  { 
     return await ipcRenderer.invoke('get-is-os-using-dark-theme')
   },

desktop/src/ui/titleBarMenu.ts

@@ -19,7 +19,7 @@ import { TitleBarMenuState } from './titleBarMenuState'
 
 export function setupTitleBarMenu(ipcMain: IPCMainExposed, root: HTMLElement): MenuBar {
     const themeManager = new ThemeManager('light')
-    const menuManager = new MenuBarManager(ipcMain, root)
+    const menuManager = new MenuBarManager(root)
 
     const menuBar = menuManager.getView();
 
@@ -282,7 +282,7 @@ class MenuBarManager {
     private readonly StateStyleKeyboardSelected = 'desktop-app-keyboard-selected'
     private readonly StateStyleAltModeActive = 'desktop-app-alt-active'
 
-    constructor(ipcMain: IPCMainExposed, private readonly root: HTMLElement) {
+    constructor(private readonly root: HTMLElement) {
         this.state = new TitleBarMenuState(
             () => this.topLevelMenus().length,
             (topLevelMenuIndex: number) => {
@@ -334,6 +334,13 @@ class MenuBarManager {
         document.querySelectorAll<HTMLButtonElement>(this.DropdownItemStyle + '[data-action]').forEach(item => {
             item.addEventListener('click', async () => this.handleMenuButtonClick(ipcMain, item))
         })
+
+        ipcMain.onWindowFocusLoss(() => {
+            this.state.exitAltMode()
+            this.altPressed = false
+            this.controlKeysActivated = false
+            this.renderState()
+        })
     }
 
     private renderState() {

desktop/src/ui/types.ts

@@ -142,6 +142,8 @@ export interface IPCMainExposed {
   maximizeWindow: () => void
   closeWindow: () => void
   onWindowStateChange: (callback: (event: IpcRendererEvent, newState: string) => void) => void
+  onWindowFocusLoss: (callback: () => void) => void
+  
   isOsUsingDarkTheme: () => Promise<boolean>
   executeMenuBarAction: (action: MenuBarAction) => void