Skip to content

Commit

Permalink
Merge branch 'main' into feat-settings-window
Browse files Browse the repository at this point in the history
  • Loading branch information
oliverschwendener authored Dec 13, 2024
2 parents 90326ee + 924bed7 commit 4f1c554
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "ueli",
"description": "Cross-Platform Keystroke Launcher",
"version": "9.12.0",
"version": "9.13.0",
"license": "MIT",
"author": {
"email": "[email protected]",
Expand Down
8 changes: 7 additions & 1 deletion src/main/Core/BrowserWindow/BrowserWindowModule.ts
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,13 @@ export class BrowserWindowModule {

ipcMain.on("escapePressed", () => shouldHideWindowOnEscapePressed() && browserWindowToggler.hide());

app.on("second-instance", () => browserWindowToggler.showAndFocus());
app.on("second-instance", (_, argv) => {
if (argv.includes("--toggle")) {
browserWindowToggler.toggle();
} else {
browserWindowToggler.showAndFocus();
}
});

BrowserWindowModule.registerUeliCommandEvents(browserWindow, eventSubscriber, browserWindowToggler);
}
Expand Down

0 comments on commit 4f1c554

Please sign in to comment.