@raydiant/playlist-window-manager 0.0.0-test-12 → 0.0.0-test-14

package/build/BrowserWindowRenderer.js

@@ -76,7 +76,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var path = __importStar(require("path"));
 var electron_1 = require("electron");
 var WindowUnresponsiveError_1 = __importDefault(require("./WindowUnresponsiveError"));
-var windowUtils_1 = require("./windowUtils");
+var boundUtils_1 = require("./boundUtils");
 var BrowserWindowRenderer = /** @class */ (function () {
     function BrowserWindowRenderer(opts) {
         this.opts = opts;
@@ -89,7 +89,7 @@ var BrowserWindowRenderer = /** @class */ (function () {
             show: false,
             frame: this.opts.frame,
             hasShadow: this.opts.hasShadow,
-            fullscreen: (0, windowUtils_1.isFullscreen)(this.opts.bounds),
+            fullscreen: (0, boundUtils_1.isFullscreen)(this.opts.bounds),
             webPreferences: {
                 preload: path.join(__dirname, 'preload.js'),
             },
@@ -134,7 +134,7 @@ var BrowserWindowRenderer = /** @class */ (function () {
                                 : this.createOrGetPooledBrowserWindow(windowId, {
                                     show: false,
                                     frame: this.opts.frame,
-                                    fullscreen: (0, windowUtils_1.isFullscreen)(this.opts.bounds),
+                                    fullscreen: (0, boundUtils_1.isFullscreen)(this.opts.bounds),
                                     // NOTE: useWindowPool: true does not work with renderChildWindowsAsBrowserViews: false
                                     // because the parent can't be changed after creating the BrowserWindow.
                                     parent: parentWindowId
@@ -385,22 +385,43 @@ var BrowserWindowRenderer = /** @class */ (function () {
      * 1919x1079.
      */
     BrowserWindowRenderer.prototype.setWindowOrViewBounds = function (window, bounds) {
-        var currentBounds = window.getBounds();
-        // calling setBounds may introduce -1px bug
-        if (currentBounds.x === bounds.x ||
-            currentBounds.y === bounds.y ||
-            currentBounds.width === bounds.width ||
-            currentBounds.height === bounds.height) {
+        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;
         }
-        // setBounds will be ignored if window was in fullscreen mode
-        if (window instanceof electron_1.BrowserWindow && !(0, windowUtils_1.isFullscreen)(bounds)) {
-            window.setFullScreen(false);
+        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 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;
         }
-        window.setBounds(bounds);
-        if (window instanceof electron_1.BrowserWindow && (0, windowUtils_1.isFullscreen)(bounds)) {
+        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 setWindowOrViewBounds6: before: ".concat(JSON.stringify({
+            fullscreen: window.isFullScreen(),
+            bounds: window.getBounds(),
+            contentBounds: window.getContentBounds(),
+            normalBounds: window.getNormalBounds(),
+        })));
     };
     BrowserWindowRenderer.prototype.getWindow = function (windowId) {
         return this.windows[windowId];

package/build/{windowUtils.d.ts → boundUtils.d.ts}

@@ -1,2 +1,3 @@
 import { WindowBounds } from './types';
 export declare const isFullscreen: (bounds: WindowBounds) => boolean;
+export declare const areBoundsEqual: (bounds1: WindowBounds, bounds2: WindowBounds) => boolean;

package/build/{windowUtils.js → boundUtils.js}

@@ -1,9 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isFullscreen = void 0;
+exports.areBoundsEqual = exports.isFullscreen = void 0;
 var electron_1 = require("electron");
 var isFullscreen = function (bounds) {
     var screenBounds = electron_1.screen.getPrimaryDisplay().bounds;
     return (bounds.width === screenBounds.width && bounds.height === screenBounds.height);
 };
 exports.isFullscreen = isFullscreen;
+var areBoundsEqual = function (bounds1, bounds2) {
+    return (bounds1.x === bounds2.x &&
+        bounds1.y === bounds2.y &&
+        bounds1.width === bounds2.width &&
+        bounds1.height === bounds2.height);
+};
+exports.areBoundsEqual = areBoundsEqual;

package/package.json

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

package/src/BrowserWindowRenderer.ts

@@ -17,7 +17,7 @@ import {
   Logger,
 } from './types';
 import WindowUnresponsiveError from './WindowUnresponsiveError';
-import { isFullscreen } from './windowUtils';
+import { areBoundsEqual, isFullscreen } from './boundUtils';
 
 interface ProxySettings {
   proxyRules: string;
@@ -475,27 +475,64 @@ export default class BrowserWindowRenderer
     window: BrowserWindow | BrowserView,
     bounds: WindowBounds
   ) {
-    const currentBounds = window.getBounds();
-    // calling setBounds may introduce -1px bug
+    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 setWindowOrViewBounds2: ${JSON.stringify(
+        {
+          newBounds: bounds,
+          fullscreen: window.isFullScreen(),
+          bounds: window.getBounds(),
+          contentBounds: window.getContentBounds(),
+          normalBounds: window.getNormalBounds(),
+        }
+      )}`
+    );
+
+    // calling setBounds or setFullscreen may introduce -1px resolution error
+    // so we try to avoid unnecessary calls
     if (
-      currentBounds.x === bounds.x ||
-      currentBounds.y === bounds.y ||
-      currentBounds.width === bounds.width ||
-      currentBounds.height === bounds.height
+      areBoundsEqual(window.getBounds(), bounds) ||
+      (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 BrowserWindow && !isFullscreen(bounds)) {
+    if (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);
     }
 
-    window.setBounds(bounds);
-
-    if (window instanceof BrowserWindow && isFullscreen(bounds)) {
-      window.setFullScreen(true);
-    }
+    this.logger.info(
+      `playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds6: before: ${JSON.stringify(
+        {
+          fullscreen: window.isFullScreen(),
+          bounds: window.getBounds(),
+          contentBounds: window.getContentBounds(),
+          normalBounds: window.getNormalBounds(),
+        }
+      )}`
+    );
   }
 
   private getWindow(windowId: string): BrowserWindowRendererWindow | null {

package/src/{windowUtils.ts → boundUtils.ts}

@@ -7,3 +7,15 @@ export const isFullscreen = (bounds: WindowBounds): boolean => {
     bounds.width === screenBounds.width && bounds.height === screenBounds.height
   );
 };
+
+export const areBoundsEqual = (
+  bounds1: WindowBounds,
+  bounds2: WindowBounds
+): boolean => {
+  return (
+    bounds1.x === bounds2.x &&
+    bounds1.y === bounds2.y &&
+    bounds1.width === bounds2.width &&
+    bounds1.height === bounds2.height
+  );
+};