Merge branch 'main' into feat/use-native-notification-for-achievements

# Conflicts:
#	src/main/index.ts
This commit is contained in:
Zamitto
2024-10-31 12:53:39 -03:00
12 changed files with 72 additions and 16 deletions

View File

@@ -268,14 +268,15 @@ export class WindowManager {
if (process.platform !== "darwin") {
tray.addListener("click", () => {
if (this.mainWindow) {
if (WindowManager.mainWindow?.isMinimized())
WindowManager.mainWindow.restore();
WindowManager.mainWindow?.focus();
return;
if (
WindowManager.mainWindow?.isMinimized() ||
!WindowManager.mainWindow?.isVisible()
) {
WindowManager.mainWindow?.show();
}
} else {
this.createMainWindow();
}
this.createMainWindow();
});
tray.addListener("right-click", showContextMenu);