fix: window closing + enable showWindowEarly

Signed-off-by: Akos Kitta <a.kitta@arduino.cc>
arduino · Feb 9, 2024 · f32d5c0 · f32d5c0
1 parent 052b355
commit f32d5c0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/arduino-ide-extension/src/electron-browser/theia/core/electron-window-service.ts b/arduino-ide-extension/src/electron-browser/theia/core/electron-window-service.ts
@@ -20,8 +20,12 @@ export class ElectronWindowService
 
   @postConstruct()
   protected override init(): void {
-    // NOOP
+    // Overridden to avoid calling the zoom level listener in super.
     // IDE2 listens on the zoom level changes in `ArduinoFrontendContribution#onStart`
+
+    window.electronTheiaCore.onAboutToClose(() => {
+      this.connectionCloseService.markForClose(this.frontendIdProvider.getId());
+    });
   }
 
   async isFirstWindow(): Promise<boolean> {

diff --git a/arduino-ide-extension/src/electron-main/theia/electron-main-application.ts b/arduino-ide-extension/src/electron-main/theia/electron-main-application.ts
@@ -422,7 +422,7 @@ export class ElectronMainApplication extends TheiaElectronMainApplication {
     }
     const [uri, electronWindow] = await Promise.all([
       this.createWindowUri(),
-      this.createWindow(options),
+      this.reuseOrCreateWindow(options),
     ]);
     electronWindow.loadURL(uri.withFragment(encodeURI(file)).toString(true));
     return electronWindow;
@@ -885,7 +885,7 @@ const fallbackFrontendAppConfig: FrontendApplicationConfig = {
   defaultIconTheme: 'none',
   validatePreferencesSchema: false,
   defaultLocale: '',
-  electron: {},
+  electron: { showWindowEarly: true },
   reloadOnReconnect: true,
 };
 

diff --git a/electron-app/package.json b/electron-app/package.json
@@ -66,6 +66,10 @@
         },
         "defaultIconTheme": "none",
         "validatePreferencesSchema": false,
+        "electron": { 
+          "showWindowEarly": true
+        },
+        "reloadOnReconnect": true,
         "preferences": {
           "window.title": "${rootName}${activeEditorShort}${appName}",
           "files.autoSave": "afterDelay",