1 files changed, 15 insertions, 5 deletions

diff --git a/packages/main/src/infrastructure/electron/impl/ElectronServiceView.ts b/packages/main/src/infrastructure/electron/impl/ElectronServiceView.ts
index 2e64269..3118efc 100644
--- a/packages/main/src/infrastructure/electron/impl/ElectronServiceView.ts
+++ b/packages/main/src/infrastructure/electron/impl/ElectronServiceView.ts
@@ -18,7 +18,6 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import type { BrowserViewBounds } from '@sophie/shared';
 import { BrowserView } from 'electron';
 
 import type Service from '../../../stores/Service';
@@ -39,7 +38,7 @@ export default class ElectronServiceView implements ServiceView {
   readonly browserView: BrowserView;
 
   constructor(
-    service: Service,
+    private readonly service: Service,
     resources: Resources,
     partition: ElectronPartition,
     private readonly parent: ElectronViewFactory,
@@ -56,6 +55,13 @@ export default class ElectronServiceView implements ServiceView {
     });
 
     this.browserView.setBackgroundColor('#fff');
+    this.browserView.setAutoResize({
+      width: true,
+      height: true,
+    });
+    // Util we first attach `browserView` to a `BrowserWindow`,
+    // `setBounds` calls will be ignored, so there's no point in callind `updateBounds` here.
+    // It will be called by `ElectronMainWindow` when we first attach this service to it.
 
     const { webContents } = this.browserView;
 
@@ -191,13 +197,17 @@ export default class ElectronServiceView implements ServiceView {
     this.browserView.webContents.toggleDevTools();
   }
 
-  setBounds(bounds: BrowserViewBounds): void {
-    this.browserView.setBounds(bounds);
+  updateBounds(): void {
+    const { x, y, width, height, hasBounds } = this.service;
+    if (!hasBounds) {
+      return;
+    }
+    this.browserView.setBounds({ x, y, width, height });
   }
 
   dispose(): void {
-    this.parent.unregisterServiceView(this.webContentsId);
     setImmediate(() => {
+      this.parent.unregisterServiceView(this.webContentsId);
       // Undocumented electron API, see e.g., https://github.com/electron/electron/issues/29626
       (
         this.browserView.webContents as unknown as { destroy(): void }