Skip to content

Fix keyboard shortcut conflict for Focus Goose Window #5809

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
michaelneale merged 3 commits into from
Dec 16, 2025
Merged

Fix keyboard shortcut conflict for Focus Goose Window #5809

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
183e993
Resolve merge conflict in openapi.json - keep upstream version
JJSwigut Aug 5, 2025
aab77e7
Merge upstream/main into main
Nov 18, 2025
ac52bad
Fix keyboard shortcut conflict for Focus Goose Window
Nov 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion ui/desktop/src/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1771,6 +1771,14 @@ async function appMain() {
console.error('Error registering launcher hotkey:', e);
}

try {
globalShortcut.register('CommandOrControl+Alt+G', () => {
focusWindow();
});
} catch (e) {
console.error('Error registering focus window hotkey:', e);
}

Comment on lines +1774 to +1781
Copy link
Collaborator

@Abhijay007 Abhijay007 Nov 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a question, do we need to add this here, as we already have an accelerator for the focus menu?

session.defaultSession.webRequest.onBeforeSendHeaders((details, callback) => {
details.requestHeaders['Origin'] = 'http://localhost:5173';
callback({ cancel: false, requestHeaders: details.requestHeaders });
Expand Down Expand Up @@ -1948,7 +1956,7 @@ async function appMain() {
fileMenu.submenu.append(
new MenuItem({
label: 'Focus Goose Window',
accelerator: 'CmdOrCtrl+Alt+Shift+G',
accelerator: 'CmdOrCtrl+Alt+G',
click() {
focusWindow();
},
Expand Down