Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
29 changes: 23 additions & 6 deletions packages/uhk-agent/src/electron-main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import { AppUpdateService } from './services/app-update.service';
import { AppService } from './services/app.service';
import { SudoService } from './services/sudo.service';
import { SmartMacroDocService } from './services/smart-macro-doc.service';
import { TrayService } from './services/tray.service';
import isDev from 'electron-is-dev';
import { setMenu } from './electron-menu';
import { loadWindowState, saveWindowState } from './util/window';
Expand Down Expand Up @@ -58,6 +59,7 @@ let appService: AppService;
let sudoService: SudoService;
let packagesDir: string;
let smartMacroDocService: SmartMacroDocService;
let trayService: TrayService;

let areServicesInited = false;

Expand Down Expand Up @@ -89,6 +91,7 @@ async function createWindow() {

logger.misc('[Electron Main] Create new window.');

const iconPath = path.join(import.meta.dirname, 'renderer/assets/images/agent-app-icon.png');
const loadedWindowState = loadWindowState(logger);
if(!smartMacroDocService.isRunning) {
await smartMacroDocService.start();
Expand All @@ -106,11 +109,14 @@ async function createWindow() {
spellcheck: false,
preload: path.join(import.meta.dirname, 'preload.js')
},
icon: path.join(import.meta.dirname, 'renderer/assets/images/agent-app-icon.png'),
icon: iconPath,
backgroundColor: await getWindowBackgroundColor(),
show: false
});

trayService = new TrayService(logger, iconPath);
trayService.init(win);

if (loadedWindowState.isFullScreen) {
win.setFullScreen(true);
} else if (loadedWindowState.isMaximized) {
Expand Down Expand Up @@ -143,7 +149,15 @@ async function createWindow() {
});

win.once('ready-to-show', () => {
win.show();
void (async () => {
await trayService.initTrayIfEnabled();

if (options['start-minimized-to-tray']) {
trayService.startInTray();
} else {
win.show();
}
})();
});

win.webContents.on('did-finish-load', () => {
Expand Down Expand Up @@ -273,6 +287,10 @@ if (isSecondInstance) {
app.exit();
});

app.on('before-quit', () => {
trayService?.markQuitting();
});

app.on('will-quit', () => {
});

Expand All @@ -284,16 +302,15 @@ if (isSecondInstance) {
.catch((error) => {
logger.error('[Electron Main] when activating the app: ', error);
});
} else if (!win.isVisible()) {
trayService.showWindow();
}
});

app.on('second-instance', () => {
// Someone tried to run a second instance, we should focus our window.
if (win) {
if (win.isMinimized()) {
win.restore();
}
win.focus();
trayService.showWindow();
}
});
}
Expand Down
Loading