fix playback oop

Author: toddtarsi

packages/selenium-ide/src/main/session/controllers/ResizablePanels/index.ts

@@ -34,34 +34,44 @@ export default class ResizablePanelsController extends BaseController {
     return currentValue || [50, 50]
   }
 
-  async recalculatePlaybackWindows() {
+  async getPlaybackWindowDimensions() {
     const panelScreenPosition = await this.getPanelScreenPosition(
       'playback-panel'
     )
     const isWindows = process.platform === 'win32'
-    this.session.windows.playbackWindows.forEach((playbackWindow) => {
-      playbackWindow.setSize(
-        panelScreenPosition.width,
-        panelScreenPosition.height
-      )
-      playbackWindow.setPosition(
+    return {
+      position: [
         panelScreenPosition.x + (isWindows ? 12 : 0),
-        panelScreenPosition.y + (isWindows ? 21 : 0)
-      )
+        panelScreenPosition.y + (isWindows ? 21 : 0),
+      ],
+      size: [panelScreenPosition.width, panelScreenPosition.height],
+    } as {
+      position: [number, number]
+      size: [number, number]
+    }
+  }
+
+  async recalculatePlaybackWindows() {
+    const panelDims = await this.getPlaybackWindowDimensions()
+    this.session.windows.playbackWindows.forEach((playbackWindow) => {
+      playbackWindow.setSize(...panelDims.size)
+      playbackWindow.setPosition(...panelDims.position)
     })
   }
 
   async setPanelGroup(id: string, dimensions: number[]) {
     this.session.store.set(`panelGroup.${id}`, dimensions)
     this.recalculatePlaybackWindows()
   }
+
   async getPanelScreenPosition(id: string) {
     const projectWindow = await this.session.windows.get('project-editor')
     const projectWindowBounds = await projectWindow.getBounds()
     const panelGroupPosition =
       (await projectWindow.webContents.executeJavaScript(
         `JSON.parse(JSON.stringify(document.querySelector('[data-panel-id="${id}"]').getBoundingClientRect()))`
       )) as Rect
+    // Holy shit what are these numbers even related to :\
     return {
       x: Math.round(panelGroupPosition.x + projectWindowBounds.x) + 2,
       y: Math.round(panelGroupPosition.y + projectWindowBounds.y) + 30,

packages/selenium-ide/src/main/session/controllers/Windows/index.ts

@@ -13,14 +13,14 @@ import { Session } from 'main/types'
 import { isAutomated } from 'main/util'
 import { join } from 'node:path'
 import BaseController from '../Base'
+import { window as playbackWindowOpts } from 'browser/windows/PlaybackWindow/controller'
 
 const playbackWindowName = 'playback-window'
 const playbackCSS = readFileSync(join(__dirname, 'highlight.css'), 'utf-8')
 const playbackWindowOptions = {
+  ...playbackWindowOpts(),
   webPreferences: {
     devTools: !isAutomated,
-    nodeIntegration: false,
-    nodeIntegrationInSubFrames: true,
     preload: join(__dirname, `playback-window-preload-bundle.js`),
   },
 }
@@ -53,13 +53,14 @@ const windowLoaderFactoryMap: WindowLoaderFactoryMap = Object.fromEntries(
           const windowConfig = window()
           const options: Electron.BrowserWindowConstructorOptions = {
             ...windowConfig,
+            ..._options,
             webPreferences: {
               devTools: !isAutomated,
               ...(windowConfig?.webPreferences ?? {}),
               preload: hasPreload ? preloadPath : undefined,
               sandbox: true,
+              ...(_options.webPreferences ?? {})
             },
-            ..._options,
           }
           const win = new BrowserWindow(options)
           win.loadFile(join(__dirname, `${filename}.html`))
@@ -162,7 +163,7 @@ export default class WindowsController extends BaseController {
     this.playbackWindows = []
   }
 
-  async get(name: string): Promise<BrowserWindow> {
+  get(name: string): BrowserWindow {
     return this.windows[name]
   }
 
@@ -388,7 +389,10 @@ export default class WindowsController extends BaseController {
     window.webContents.setWindowOpenHandler(() => {
       return {
         action: 'allow',
-        overrideBrowserWindowOptions: playbackWindowOptions,
+        overrideBrowserWindowOptions: {
+          ...playbackWindowOptions,
+          parent: this.get(projectEditorWindowName),
+        },
       }
     })