@raydiant/playlist-window-manager 0.0.0-test-13 → 0.0.0-test-15

package/build/BrowserWindowRenderer.js

@@ -95,6 +95,7 @@ var BrowserWindowRenderer = /** @class */ (function () {
             },
         });
         this.proxySettings = null;
+        this.logger = opts.logger;
         opts.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts constructor1 ".concat(JSON.stringify(opts.bounds)));
         this.setWindowOrViewBounds(this.offscreenWindow, opts.bounds);
         opts.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts constructor2 ".concat(JSON.stringify({
@@ -106,7 +107,6 @@ var BrowserWindowRenderer = /** @class */ (function () {
         if (opts.proxySettings) {
             this.proxySettings = opts.proxySettings;
         }
-        this.logger = opts.logger;
         if (opts.windowCrashHandler) {
             this.windowCrashHandler = opts.windowCrashHandler;
         }
@@ -385,31 +385,43 @@ var BrowserWindowRenderer = /** @class */ (function () {
      * 1919x1079.
      */
     BrowserWindowRenderer.prototype.setWindowOrViewBounds = function (window, bounds) {
-        this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds1: ".concat(JSON.stringify({
-            windowBounds: window.getBounds(),
-            bounds: bounds,
+        if (window instanceof electron_1.BrowserView) {
+            this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds1: ".concat(JSON.stringify({
+                windowBounds: window.getBounds(),
+                bounds: bounds,
+            })));
+            window.setBounds(bounds);
+            return;
+        }
+        this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds2: ".concat(JSON.stringify({
+            newBounds: bounds,
+            fullscreen: window.isFullScreen(),
+            bounds: window.getBounds(),
+            contentBounds: window.getContentBounds(),
+            normalBounds: window.getNormalBounds(),
         })));
-        // calling setBounds may introduce -1px resolution error
-        if ((0, boundUtils_1.areBoundsEqual)(window.getBounds(), bounds)) {
-            this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds2: bounds are equal");
+        // calling setBounds or setFullscreen may introduce -1px resolution error
+        // so we try to avoid unnecessary calls
+        if ((0, boundUtils_1.areBoundsEqual)(window.getBounds(), bounds) ||
+            ((0, boundUtils_1.isFullscreen)(bounds) && window.isFullScreen())) {
+            this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds3: bounds are equal");
             return;
         }
-        // setBounds will be ignored if window was in fullscreen mode
-        if (window instanceof electron_1.BrowserWindow && !(0, boundUtils_1.isFullscreen)(bounds)) {
-            this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds3: not full screen");
+        if ((0, boundUtils_1.isFullscreen)(bounds)) {
+            this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds4: full screen");
+            window.setFullScreen(true);
+        }
+        else {
+            // setBounds will be ignored if window was in fullscreen mode
             window.setFullScreen(false);
+            window.setBounds(bounds);
         }
-        this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds4: before: ".concat(JSON.stringify({
-            windowBounds: window.getBounds(),
-        })));
-        window.setBounds(bounds);
-        this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds5: before: ".concat(JSON.stringify({
-            windowBounds: window.getBounds(),
+        this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds6: before: ".concat(JSON.stringify({
+            fullscreen: window.isFullScreen(),
+            bounds: window.getBounds(),
+            contentBounds: window.getContentBounds(),
+            normalBounds: window.getNormalBounds(),
         })));
-        if (window instanceof electron_1.BrowserWindow && (0, boundUtils_1.isFullscreen)(bounds)) {
-            this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds6: is full screen");
-            window.setFullScreen(true);
-        }
     };
     BrowserWindowRenderer.prototype.getWindow = function (windowId) {
         return this.windows[windowId];

package/package.json

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

package/src/BrowserWindowRenderer.ts

@@ -75,6 +75,7 @@ export default class BrowserWindowRenderer
   private logger: Logger;
 
   constructor(private opts: BrowserWindowRendererOptions) {
+    this.logger = opts.logger;
     opts.logger.info(
       `playlist-window-manager/src/BrowserWindowRenderer.ts constructor1 ${JSON.stringify(
         opts.bounds
@@ -96,8 +97,6 @@ export default class BrowserWindowRenderer
       this.proxySettings = opts.proxySettings;
     }
 
-    this.logger = opts.logger;
-
     if (opts.windowCrashHandler) {
       this.windowCrashHandler = opts.windowCrashHandler;
     }
@@ -475,53 +474,64 @@ export default class BrowserWindowRenderer
     window: BrowserWindow | BrowserView,
     bounds: WindowBounds
   ) {
+    if (window instanceof BrowserView) {
+      this.logger.info(
+        `playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds1: ${JSON.stringify(
+          {
+            windowBounds: window.getBounds(),
+            bounds,
+          }
+        )}`
+      );
+      window.setBounds(bounds);
+      return;
+    }
+
     this.logger.info(
-      `playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds1: ${JSON.stringify(
+      `playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds2: ${JSON.stringify(
         {
-          windowBounds: window.getBounds(),
-          bounds,
+          newBounds: bounds,
+          fullscreen: window.isFullScreen(),
+          bounds: window.getBounds(),
+          contentBounds: window.getContentBounds(),
+          normalBounds: window.getNormalBounds(),
         }
       )}`
     );
 
-    // calling setBounds may introduce -1px resolution error
-    if (areBoundsEqual(window.getBounds(), bounds)) {
+    // calling setBounds or setFullscreen may introduce -1px resolution error
+    // so we try to avoid unnecessary calls
+    if (
+      areBoundsEqual(window.getBounds(), bounds) ||
+      (isFullscreen(bounds) && window.isFullScreen())
+    ) {
       this.logger.info(
-        `playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds2: bounds are equal`
+        `playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds3: bounds are equal`
       );
       return;
     }
 
-    // setBounds will be ignored if window was in fullscreen mode
-    if (window instanceof BrowserWindow && !isFullscreen(bounds)) {
+    if (isFullscreen(bounds)) {
       this.logger.info(
-        `playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds3: not full screen`
+        `playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds4: full screen`
       );
+      window.setFullScreen(true);
+    } else {
+      // setBounds will be ignored if window was in fullscreen mode
       window.setFullScreen(false);
+      window.setBounds(bounds);
     }
 
     this.logger.info(
-      `playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds4: before: ${JSON.stringify(
-        {
-          windowBounds: window.getBounds(),
-        }
-      )}`
-    );
-    window.setBounds(bounds);
-    this.logger.info(
-      `playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds5: before: ${JSON.stringify(
+      `playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds6: before: ${JSON.stringify(
         {
-          windowBounds: window.getBounds(),
+          fullscreen: window.isFullScreen(),
+          bounds: window.getBounds(),
+          contentBounds: window.getContentBounds(),
+          normalBounds: window.getNormalBounds(),
         }
       )}`
     );
-
-    if (window instanceof BrowserWindow && isFullscreen(bounds)) {
-      this.logger.info(
-        `playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds6: is full screen`
-      );
-      window.setFullScreen(true);
-    }
   }
 
   private getWindow(windowId: string): BrowserWindowRendererWindow | null {