Upstream/waveterm
1
0
Fork 0
mirror of https://github.com/wavetermdev/waveterm.git synced 2024-12-21 16:38:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

always recreate existing window if possible (for the last window only)

Browse Source
This commit is contained in:
sawka 2024-09-09 11:49:57 -07:00
parent f62d96ae99
commit 5190556c37
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
emain/emain.ts
View File

@ -445,7 +445,7 @@ function createBrowserWindow(clientId: string, waveWindow: WaveWindow, fullConfi
return;
}
const numWindows = electron.BrowserWindow.getAllWindows().length;
if ((unamePlatform == "win32" || unamePlatform == "linux") && numWindows == 1) {
if (numWindows == 1) {
return;
}
const choice = electron.dialog.showMessageBoxSync(win, {
@ -463,7 +463,7 @@ function createBrowserWindow(clientId: string, waveWindow: WaveWindow, fullConfi
return;
}
const numWindows = electron.BrowserWindow.getAllWindows().length;
if ((unamePlatform == "win32" || unamePlatform == "linux") && numWindows == 0) {
if (numWindows == 0) {
return;
}
services.WindowService.CloseWindow(waveWindow.oid);
@ -669,9 +669,25 @@ if (unamePlatform !== "darwin") {
async function createNewWaveWindow(): Promise<void> {
const clientData = await services.ClientService.GetClientData();
const newWindow = await services.ClientService.MakeWindow();
const fullConfig = await services.FileService.GetFullConfig();
let recreatedWindow = false;
if (electron.BrowserWindow.getAllWindows().length === 0 && clientData?.windowids?.length >= 1) {
// reopen the first window
const existingWindowId = clientData.windowids[0];
const existingWindowData = (await services.ObjectService.GetObject("window:" + existingWindowId)) as WaveWindow;
if (existingWindowData != null) {
const win = createBrowserWindow(clientData.oid, existingWindowData, fullConfig);
await win.readyPromise;
win.show();
recreatedWindow = true;
}
}
if (recreatedWindow) {
return;
}
const newWindow = await services.ClientService.MakeWindow();
const newBrowserWindow = createBrowserWindow(clientData.oid, newWindow, fullConfig);
await newBrowserWindow.readyPromise;
newBrowserWindow.show();
}