@raydiant/playlist-window-manager 0.0.0-test30 → 0.0.0-test32

package/build/BrowserWindowRenderer.js

@@ -69,6 +69,17 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -95,6 +106,12 @@ var BrowserWindowRenderer = /** @class */ (function () {
             },
         });
         this.proxySettings = null;
+        opts.logger.info("offscreenWindow = new BrowserWindow(".concat(JSON.stringify({
+            show: false,
+            frame: this.opts.frame,
+            fullscreen: this.opts.fullscreen,
+            hasShadow: this.opts.hasShadow,
+        }), ")"));
         if (!opts.fullscreen) {
             this.offscreenWindow.setBounds(opts.bounds);
         }
@@ -114,6 +131,13 @@ var BrowserWindowRenderer = /** @class */ (function () {
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
+                        this.logger.info("BrowserWindowRenderer.createWindow(".concat(JSON.stringify({
+                            windowId: windowId,
+                            parentWindowId: parentWindowId,
+                            bounds: bounds,
+                        }), ")"));
+                        this.logger.info("BrowserWindowRenderer.createWindow adjust bounds: ".concat(parentWindowId && !this.opts.renderChildWindowsAsBrowserViews, ". New Bounds ").concat(JSON.stringify(parentWindowId && !this.opts.renderChildWindowsAsBrowserViews
+                            ? __assign(__assign({}, bounds), { x: bounds.x + this.opts.bounds.x, y: bounds.y + this.opts.bounds.y }) : bounds), "\n    "));
                         window = {
                             parentWindowId: parentWindowId,
                             // If we are creating a child window and renderChildWindowsAsBrowserViews is true,
@@ -125,22 +149,17 @@ var BrowserWindowRenderer = /** @class */ (function () {
                                         contextIsolation: false,
                                     },
                                 })
-                                : this.createOrGetPooledBrowserWindow(windowId, {
-                                    show: false,
-                                    frame: this.opts.frame,
-                                    fullscreen: this.opts.fullscreen,
+                                : this.createOrGetPooledBrowserWindow(windowId, __assign({ show: false, frame: this.opts.frame, fullscreen: this.opts.fullscreen, 
                                     // NOTE: useWindowPool: true does not work with renderChildWindowsAsBrowserViews: false
                                     // because the parent can't be changed after creating the BrowserWindow.
                                     parent: parentWindowId
                                         ? this.getParentBrowserView(parentWindowId)
-                                        : undefined,
-                                    transparent: backgroundColor === 'transparent',
-                                    hasShadow: this.opts.hasShadow,
-                                    webPreferences: {
+                                        : undefined, transparent: backgroundColor === 'transparent', hasShadow: this.opts.hasShadow, webPreferences: {
                                         preload: path.join(__dirname, 'preload.js'),
                                         contextIsolation: false,
-                                    },
-                                }),
+                                    } }, (this.opts.fullscreen
+                                    ? { width: bounds.width, height: bounds.height }
+                                    : {}))),
                             // If we are creating a child window and renderChildWindowsAsBrowserViews is false that means
                             // we are rendering child windows with BrowserWindow. BrowserWindows are positioned absolutely so
                             // to place them in the correct spot relative to their parent we need to add the main window's x / y.
@@ -401,6 +420,10 @@ var BrowserWindowRenderer = /** @class */ (function () {
             }
         }
         if (!browserWindow) {
+            // TODO remove
+            var parent_1 = options.parent, webPreferences = options.webPreferences, rest = __rest(options, ["parent", "webPreferences"]);
+            var newOptions = __assign(__assign({}, rest), { parentId: parent_1 === null || parent_1 === void 0 ? void 0 : parent_1.id });
+            this.logger.info("BrowserWindowRenderer.createOrGetPooledBrowserWindow, new BrowserWindow(".concat(JSON.stringify(newOptions), ")"));
             browserWindow = new electron_1.BrowserWindow(options);
             if (this.opts.useWindowPool) {
                 this.browserWindowPool.add(browserWindow);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raydiant/playlist-window-manager",
-  "version": "0.0.0-test30",
+  "version": "0.0.0-test32",
   "description": "Window manager for playlist playback.",
   "main": "build/index.js",
   "scripts": {

package/src/BrowserWindowRenderer.ts

@@ -78,6 +78,14 @@ export default class BrowserWindowRenderer
   private logger: Logger;
 
   constructor(private opts: BrowserWindowRendererOptions) {
+    opts.logger.info(
+      `offscreenWindow = new BrowserWindow(${JSON.stringify({
+        show: false,
+        frame: this.opts.frame,
+        fullscreen: this.opts.fullscreen,
+        hasShadow: this.opts.hasShadow,
+      })})`
+    );
     if (!opts.fullscreen) {
       this.offscreenWindow.setBounds(opts.bounds);
     }
@@ -100,6 +108,28 @@ export default class BrowserWindowRenderer
     receiveMessageCallback,
     errorCallback,
   }: CreateWindowOptions) {
+    this.logger.info(
+      `BrowserWindowRenderer.createWindow(${JSON.stringify({
+        windowId,
+        parentWindowId,
+        bounds,
+      })})`
+    );
+    this.logger.info(
+      `BrowserWindowRenderer.createWindow adjust bounds: ${
+        parentWindowId && !this.opts.renderChildWindowsAsBrowserViews
+      }. New Bounds ${JSON.stringify(
+        parentWindowId && !this.opts.renderChildWindowsAsBrowserViews
+          ? {
+              ...bounds,
+              x: bounds.x + this.opts.bounds.x,
+              y: bounds.y + this.opts.bounds.y,
+            }
+          : bounds
+      )}
+    `
+    );
+
     const window: BrowserWindowRendererWindow = {
       parentWindowId,
       // If we are creating a child window and renderChildWindowsAsBrowserViews is true,
@@ -127,6 +157,9 @@ export default class BrowserWindowRenderer
                 preload: path.join(__dirname, 'preload.js'),
                 contextIsolation: false,
               },
+              ...(this.opts.fullscreen
+                ? { width: bounds.width, height: bounds.height }
+                : {}),
             }),
       // If we are creating a child window and renderChildWindowsAsBrowserViews is false that means
       // we are rendering child windows with BrowserWindow. BrowserWindows are positioned absolutely so
@@ -470,6 +503,15 @@ export default class BrowserWindowRenderer
     }
 
     if (!browserWindow) {
+      // TODO remove
+      const { parent, webPreferences, ...rest } = options;
+      const newOptions = { ...rest, parentId: parent?.id };
+      this.logger.info(
+        `BrowserWindowRenderer.createOrGetPooledBrowserWindow, new BrowserWindow(${JSON.stringify(
+          newOptions
+        )})`
+      );
+
       browserWindow = new BrowserWindow(options);
       if (this.opts.useWindowPool) {
         this.browserWindowPool.add(browserWindow);