@raydiant/playlist-window-manager 0.0.0-test-8 → 0.0.0-test-10

package/build/BrowserWindowRenderer.d.ts

@@ -33,6 +33,13 @@ export default class BrowserWindowRenderer implements PresentationWindowRenderer
     sendMessageObject(windowId: string, type: string, payload?: any): void;
     muteWindow(windowId: string): void;
     unMuteWindow(windowId: string): void;
+    /**
+     * This function is designed to solve missing 1px issue.
+     * If we set 1920x1080 bounds on 1920x1080 display
+     * then the actual BrowserWindow resolution would be
+     * 1919x1079.
+     */
+    private setWindowOrViewBounds;
     private getWindow;
     private moveWindowOffscreen;
     private addWindowToParent;

package/build/BrowserWindowRenderer.js

@@ -76,6 +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 BrowserWindowRenderer = /** @class */ (function () {
     function BrowserWindowRenderer(opts) {
         this.opts = opts;
@@ -88,15 +89,16 @@ var BrowserWindowRenderer = /** @class */ (function () {
             show: false,
             frame: this.opts.frame,
             hasShadow: this.opts.hasShadow,
-            fullscreen: true,
+            fullscreen: (0, windowUtils_1.isFullscreen)(this.opts.bounds),
             webPreferences: {
                 preload: path.join(__dirname, 'preload.js'),
             },
         });
         this.proxySettings = null;
         opts.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts constructor1 ".concat(JSON.stringify(opts.bounds)));
-        this.offscreenWindow.setBounds(opts.bounds);
+        this.setWindowOrViewBounds(this.offscreenWindow, opts.bounds);
         opts.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts constructor2 ".concat(JSON.stringify({
+            fullscreen: this.offscreenWindow.isFullScreen(),
             bounds: this.offscreenWindow.getBounds(),
             normalBounds: this.offscreenWindow.getNormalBounds(),
             contentBounds: this.offscreenWindow.getContentBounds(),
@@ -132,6 +134,7 @@ var BrowserWindowRenderer = /** @class */ (function () {
                                 : this.createOrGetPooledBrowserWindow(windowId, {
                                     show: false,
                                     frame: this.opts.frame,
+                                    fullscreen: (0, windowUtils_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
@@ -173,6 +176,7 @@ var BrowserWindowRenderer = /** @class */ (function () {
                         if (window.view instanceof electron_1.BrowserView) {
                             this.moveWindowOffscreen(window);
                             this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts createWindow2: ".concat(JSON.stringify({
+                                fullscreen: this.offscreenWindow.isFullScreen(),
                                 bounds: this.offscreenWindow.getBounds(),
                                 normalBounds: this.offscreenWindow.getNormalBounds(),
                                 contentBounds: this.offscreenWindow.getContentBounds(),
@@ -187,15 +191,7 @@ var BrowserWindowRenderer = /** @class */ (function () {
                             window.view.setBackgroundColor(backgroundColor === 'transparent' ? '#00000000' : backgroundColor);
                         }
                         this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts createWindow4: ".concat(JSON.stringify(window.bounds)));
-                        // TODO zlv added
-                        if (window.view instanceof electron_1.BrowserWindow) {
-                            this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts createWindow5:");
-                            window.view.setBounds(window.bounds);
-                        }
-                        else {
-                            this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts createWindow6: setBounds");
-                            window.view.setBounds(window.bounds);
-                        }
+                        this.setWindowOrViewBounds(window.view, window.bounds);
                         this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts createWindow7: ".concat(JSON.stringify(window.view.getBounds())));
                         if (!this.proxySettings) return [3 /*break*/, 2];
                         return [4 /*yield*/, window.view.webContents.session.setProxy(this.proxySettings)];
@@ -237,11 +233,13 @@ var BrowserWindowRenderer = /** @class */ (function () {
         this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts updateWindowBounds1: ".concat(JSON.stringify(bounds)));
         window.bounds = bounds;
         if (window.view instanceof electron_1.BrowserWindow && window.parentWindowId) {
-            this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts updateWindowBounds2: ".concat(JSON.stringify(__assign(__assign({}, window.bounds), { x: window.bounds.x + this.opts.bounds.x, y: window.bounds.y + this.opts.bounds.y }))));
             // Child BrowserWindows are absolutely positioned so we need to add the main windows
             // x/y to when updating the child window's bounds.
-            window.view.setBounds(__assign(__assign({}, window.bounds), { x: window.bounds.x + this.opts.bounds.x, y: window.bounds.y + this.opts.bounds.y }));
+            var newBounds = __assign(__assign({}, window.bounds), { x: window.bounds.x + this.opts.bounds.x, y: window.bounds.y + this.opts.bounds.y });
+            this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts updateWindowBounds2: ".concat(JSON.stringify(newBounds)));
+            this.setWindowOrViewBounds(window.view, newBounds);
             this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts updateWindowBounds3: ".concat(JSON.stringify({
+                fullscreen: window.view.isFullScreen(),
                 bounds: window.view.getBounds(),
                 normalBounds: window.view.getNormalBounds(),
                 contentBounds: window.view.getContentBounds(),
@@ -249,7 +247,7 @@ var BrowserWindowRenderer = /** @class */ (function () {
         }
         else {
             this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts updateWindowBounds4: ".concat(JSON.stringify(window.bounds)));
-            window.view.setBounds(window.bounds);
+            this.setWindowOrViewBounds(window.view, window.bounds);
             this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts updateWindowBounds5: ".concat(JSON.stringify(window.view.getBounds())));
         }
     };
@@ -354,6 +352,22 @@ var BrowserWindowRenderer = /** @class */ (function () {
         }
         window.view.webContents.setAudioMuted(false);
     };
+    /**
+     * This function is designed to solve missing 1px issue.
+     * If we set 1920x1080 bounds on 1920x1080 display
+     * then the actual BrowserWindow resolution would be
+     * 1919x1079.
+     */
+    BrowserWindowRenderer.prototype.setWindowOrViewBounds = function (window, bounds) {
+        // setBounds will be ignored if window was in fullscreen mode
+        if (window instanceof electron_1.BrowserWindow && !(0, windowUtils_1.isFullscreen)(bounds)) {
+            window.setFullScreen(false);
+        }
+        window.setBounds(bounds);
+        if (window instanceof electron_1.BrowserWindow && (0, windowUtils_1.isFullscreen)(bounds)) {
+            window.setFullScreen(true);
+        }
+    };
     BrowserWindowRenderer.prototype.getWindow = function (windowId) {
         return this.windows[windowId];
     };

package/build/windowUtils.d.ts

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

package/build/windowUtils.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+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;

package/package.json

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

package/src/BrowserWindowRenderer.ts

@@ -16,6 +16,7 @@ import {
   Logger,
 } from './types';
 import WindowUnresponsiveError from './WindowUnresponsiveError';
+import { isFullscreen } from './windowUtils';
 
 interface ProxySettings {
   proxyRules: string;
@@ -62,7 +63,7 @@ export default class BrowserWindowRenderer
     show: false,
     frame: this.opts.frame,
     hasShadow: this.opts.hasShadow,
-    fullscreen: true,
+    fullscreen: isFullscreen(this.opts.bounds),
     webPreferences: {
       preload: path.join(__dirname, 'preload.js'),
     },
@@ -78,10 +79,11 @@ export default class BrowserWindowRenderer
         opts.bounds
       )}`
     );
-    this.offscreenWindow.setBounds(opts.bounds);
+    this.setWindowOrViewBounds(this.offscreenWindow, opts.bounds);
     opts.logger.info(
       `playlist-window-manager/src/BrowserWindowRenderer.ts constructor2 ${JSON.stringify(
         {
+          fullscreen: this.offscreenWindow.isFullScreen(),
           bounds: this.offscreenWindow.getBounds(),
           normalBounds: this.offscreenWindow.getNormalBounds(),
           contentBounds: this.offscreenWindow.getContentBounds(),
@@ -107,7 +109,7 @@ export default class BrowserWindowRenderer
     backgroundColor,
     receiveMessageCallback,
     errorCallback,
-  }: CreateWindowOptions) {
+  }: CreateWindowOptions): Promise<void> {
     this.logger.info(
       `playlist-window-manager/src/BrowserWindowRenderer.ts createWindow1: ${JSON.stringify(
         parentWindowId && !this.opts.renderChildWindowsAsBrowserViews
@@ -133,6 +135,7 @@ export default class BrowserWindowRenderer
           : this.createOrGetPooledBrowserWindow(windowId, {
               show: false,
               frame: this.opts.frame,
+              fullscreen: 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
@@ -207,6 +210,7 @@ export default class BrowserWindowRenderer
       this.logger.info(
         `playlist-window-manager/src/BrowserWindowRenderer.ts createWindow2: ${JSON.stringify(
           {
+            fullscreen: this.offscreenWindow.isFullScreen(),
             bounds: this.offscreenWindow.getBounds(),
             normalBounds: this.offscreenWindow.getNormalBounds(),
             contentBounds: this.offscreenWindow.getContentBounds(),
@@ -232,18 +236,7 @@ export default class BrowserWindowRenderer
         window.bounds
       )}`
     );
-    // TODO zlv added
-    if (window.view instanceof BrowserWindow) {
-      this.logger.info(
-        `playlist-window-manager/src/BrowserWindowRenderer.ts createWindow5:`
-      );
-      window.view.setBounds(window.bounds);
-    } else {
-      this.logger.info(
-        `playlist-window-manager/src/BrowserWindowRenderer.ts createWindow6: setBounds`
-      );
-      window.view.setBounds(window.bounds);
-    }
+    this.setWindowOrViewBounds(window.view, window.bounds);
     this.logger.info(
       `playlist-window-manager/src/BrowserWindowRenderer.ts createWindow7: ${JSON.stringify(
         window.view.getBounds()
@@ -285,27 +278,24 @@ export default class BrowserWindowRenderer
     window.bounds = bounds;
 
     if (window.view instanceof BrowserWindow && window.parentWindowId) {
-      this.logger.info(
-        `playlist-window-manager/src/BrowserWindowRenderer.ts updateWindowBounds2: ${JSON.stringify(
-          {
-            ...window.bounds,
-            x: window.bounds.x + this.opts.bounds.x,
-            y: window.bounds.y + this.opts.bounds.y,
-          }
-        )}`
-      );
-
       // Child BrowserWindows are absolutely positioned so we need to add the main windows
       // x/y to when updating the child window's bounds.
-      window.view.setBounds({
+      const newBounds = {
         ...window.bounds,
         x: window.bounds.x + this.opts.bounds.x,
         y: window.bounds.y + this.opts.bounds.y,
-      });
+      };
+      this.logger.info(
+        `playlist-window-manager/src/BrowserWindowRenderer.ts updateWindowBounds2: ${JSON.stringify(
+          newBounds
+        )}`
+      );
+      this.setWindowOrViewBounds(window.view, newBounds);
 
       this.logger.info(
         `playlist-window-manager/src/BrowserWindowRenderer.ts updateWindowBounds3: ${JSON.stringify(
           {
+            fullscreen: window.view.isFullScreen(),
             bounds: window.view.getBounds(),
             normalBounds: window.view.getNormalBounds(),
             contentBounds: window.view.getContentBounds(),
@@ -318,7 +308,7 @@ export default class BrowserWindowRenderer
           window.bounds
         )}`
       );
-      window.view.setBounds(window.bounds);
+      this.setWindowOrViewBounds(window.view, window.bounds);
       this.logger.info(
         `playlist-window-manager/src/BrowserWindowRenderer.ts updateWindowBounds5: ${JSON.stringify(
           window.view.getBounds()
@@ -442,6 +432,26 @@ export default class BrowserWindowRenderer
     window.view.webContents.setAudioMuted(false);
   }
 
+  /**
+   * This function is designed to solve missing 1px issue.
+   * If we set 1920x1080 bounds on 1920x1080 display
+   * then the actual BrowserWindow resolution would be
+   * 1919x1079.
+   */
+  private setWindowOrViewBounds(
+    window: BrowserWindow | BrowserView,
+    bounds: WindowBounds
+  ) {
+    // setBounds will be ignored if window was in fullscreen mode
+    if (window instanceof BrowserWindow && !isFullscreen(bounds)) {
+      window.setFullScreen(false);
+    }
+    window.setBounds(bounds);
+    if (window instanceof BrowserWindow && isFullscreen(bounds)) {
+      window.setFullScreen(true);
+    }
+  }
+
   private getWindow(windowId: string): BrowserWindowRendererWindow | null {
     return this.windows[windowId];
   }

package/src/windowUtils.ts

@@ -0,0 +1,9 @@
+import { screen } from 'electron';
+import { WindowBounds } from './types';
+
+export const isFullscreen = (bounds: WindowBounds): boolean => {
+  const screenBounds = screen.getPrimaryDisplay().bounds;
+  return (
+    bounds.width === screenBounds.width && bounds.height === screenBounds.height
+  );
+};