@raydiant/playlist-window-manager 0.0.0-test-23 → 0.0.0-test-24

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/build/BrowserWindowRenderer.js +22 -9
  2. package/package.json +1 -1
  3. package/src/BrowserWindowRenderer.ts +28 -9
package/build/BrowserWindowRenderer.js CHANGED
@@ -275,7 +275,7 @@ var BrowserWindowRenderer = /** @class */ (function () {
275
275
  }
276
276
  };
277
277
  BrowserWindowRenderer.prototype.showWindow = function (windowId, isFocused) {
278
- this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts showWindow1");
278
+ this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts showWindow1: ".concat(windowId));
279
279
  var window = this.getWindow(windowId);
280
280
  var windowBounds = this.getWindowBounds(windowId);
281
281
  if (!window || !windowBounds) {
@@ -284,6 +284,7 @@ var BrowserWindowRenderer = /** @class */ (function () {
284
284
  if (window.view instanceof electron_1.BrowserWindow) {
285
285
  this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts showWindow2: ".concat(JSON.stringify({
286
286
  fullscreen: window.view.isFullScreen(),
287
+ isMaximized: window.view.isMaximized(),
287
288
  bounds: window.view.getBounds(),
288
289
  windowBounds: windowBounds,
289
290
  normalBounds: window.view.getNormalBounds(),
@@ -295,6 +296,7 @@ var BrowserWindowRenderer = /** @class */ (function () {
295
296
  }
296
297
  this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts showWindow4: ".concat(JSON.stringify({
297
298
  fullscreen: window.view.isFullScreen(),
299
+ isMaximized: window.view.isMaximized(),
298
300
  bounds: window.view.getBounds(),
299
301
  normalBounds: window.view.getNormalBounds(),
300
302
  contentBounds: window.view.getContentBounds(),
@@ -413,6 +415,7 @@ var BrowserWindowRenderer = /** @class */ (function () {
413
415
  this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds2: ".concat(JSON.stringify({
414
416
  newBounds: bounds,
415
417
  fullscreen: window.isFullScreen(),
418
+ isMaximized: window.isMaximized(),
416
419
  bounds: window.getBounds(),
417
420
  contentBounds: window.getContentBounds(),
418
421
  normalBounds: window.getNormalBounds(),
@@ -423,34 +426,41 @@ var BrowserWindowRenderer = /** @class */ (function () {
423
426
  this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds3: bounds are equal");
424
427
  return;
425
428
  }
426
- if ((0, boundUtils_1.isFullscreen)(bounds) !== window.isFullScreen()) {
427
- this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds4: setFullScreen");
428
- window.setFullScreen((0, boundUtils_1.isFullscreen)(bounds));
429
+ if (!(0, boundUtils_1.areBoundsEqual)(window.getBounds(), bounds)) {
430
+ this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds4: setBounds");
431
+ window.setBounds(bounds);
429
432
  }
430
- this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds5: before: ".concat(JSON.stringify({
433
+ this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds5: ".concat(JSON.stringify({
431
434
  fullscreen: window.isFullScreen(),
435
+ isMaximized: window.isMaximized(),
432
436
  bounds: window.getBounds(),
433
437
  contentBounds: window.getContentBounds(),
434
438
  normalBounds: window.getNormalBounds(),
435
439
  })));
436
- window.setBounds(bounds);
437
- this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds6: before: ".concat(JSON.stringify({
440
+ if ((0, boundUtils_1.isFullscreen)(bounds) !== window.isFullScreen()) {
441
+ this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds6: setFullScreen");
442
+ window.setFullScreen((0, boundUtils_1.isFullscreen)(bounds));
443
+ }
444
+ this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds7: ".concat(JSON.stringify({
438
445
  fullscreen: window.isFullScreen(),
446
+ isMaximized: window.isMaximized(),
439
447
  bounds: window.getBounds(),
440
448
  contentBounds: window.getContentBounds(),
441
449
  normalBounds: window.getNormalBounds(),
442
450
  })));
443
451
  if (window.isFullScreen() && !(0, boundUtils_1.isFullscreen)(window.getBounds())) {
444
- this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds7: window not fullscreen: ".concat(JSON.stringify({
452
+ this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds8: maximize: ".concat(JSON.stringify({
445
453
  fullscreen: window.isFullScreen(),
454
+ isMaximized: window.isMaximized(),
446
455
  bounds: window.getBounds(),
447
456
  contentBounds: window.getContentBounds(),
448
457
  normalBounds: window.getNormalBounds(),
449
458
  })));
450
459
  window.maximize();
451
460
  }
452
- this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds8: last: ".concat(JSON.stringify({
461
+ this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds9: ".concat(JSON.stringify({
453
462
  fullscreen: window.isFullScreen(),
463
+ isMaximized: window.isMaximized(),
454
464
  bounds: window.getBounds(),
455
465
  contentBounds: window.getContentBounds(),
456
466
  normalBounds: window.getNormalBounds(),
@@ -549,6 +559,9 @@ var BrowserWindowRenderer = /** @class */ (function () {
549
559
  return __generator(this, function (_a) {
550
560
  switch (_a.label) {
551
561
  case 0:
562
+ this.logger.info("playlist-window-manager/src/BrowserWindowRenderer.ts destroyOrUnloadPooledBrowserWindow1: ".concat(JSON.stringify({
563
+ windowId: windowId,
564
+ })));
552
565
  if (!this.opts.useWindowPool) return [3 /*break*/, 2];
553
566
  this.hideWindow(windowId);
554
567
  return [4 /*yield*/, browserWindow.webContents.loadURL('about:blank')];
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@raydiant/playlist-window-manager",
3
- "version": "0.0.0-test-23",
3
+ "version": "0.0.0-test-24",
4
4
  "description": "Window manager for playlist playback.",
5
5
  "main": "build/index.js",
6
6
  "scripts": {
package/src/BrowserWindowRenderer.ts CHANGED
@@ -360,7 +360,7 @@ export default class BrowserWindowRenderer
360
360
 
361
361
  public showWindow(windowId: string, isFocused: boolean) {
362
362
  this.logger.info(
363
- `playlist-window-manager/src/BrowserWindowRenderer.ts showWindow1`
363
+ `playlist-window-manager/src/BrowserWindowRenderer.ts showWindow1: ${windowId}`
364
364
  );
365
365
  const window = this.getWindow(windowId);
366
366
  const windowBounds = this.getWindowBounds(windowId);
@@ -373,6 +373,7 @@ export default class BrowserWindowRenderer
373
373
  `playlist-window-manager/src/BrowserWindowRenderer.ts showWindow2: ${JSON.stringify(
374
374
  {
375
375
  fullscreen: window.view.isFullScreen(),
376
+ isMaximized: window.view.isMaximized(),
376
377
  bounds: window.view.getBounds(),
377
378
  windowBounds: windowBounds,
378
379
  normalBounds: window.view.getNormalBounds(),
@@ -391,6 +392,7 @@ export default class BrowserWindowRenderer
391
392
  `playlist-window-manager/src/BrowserWindowRenderer.ts showWindow4: ${JSON.stringify(
392
393
  {
393
394
  fullscreen: window.view.isFullScreen(),
395
+ isMaximized: window.view.isMaximized(),
394
396
  bounds: window.view.getBounds(),
395
397
  normalBounds: window.view.getNormalBounds(),
396
398
  contentBounds: window.view.getContentBounds(),
@@ -534,6 +536,7 @@ export default class BrowserWindowRenderer
534
536
  {
535
537
  newBounds: bounds,
536
538
  fullscreen: window.isFullScreen(),
539
+ isMaximized: window.isMaximized(),
537
540
  bounds: window.getBounds(),
538
541
  contentBounds: window.getContentBounds(),
539
542
  normalBounds: window.getNormalBounds(),
@@ -550,17 +553,18 @@ export default class BrowserWindowRenderer
550
553
  return;
551
554
  }
552
555
 
553
- if (isFullscreen(bounds) !== window.isFullScreen()) {
556
+ if (!areBoundsEqual(window.getBounds(), bounds)) {
554
557
  this.logger.info(
555
- `playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds4: setFullScreen`
558
+ `playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds4: setBounds`
556
559
  );
557
- window.setFullScreen(isFullscreen(bounds));
560
+ window.setBounds(bounds);
558
561
  }
559
562
 
560
563
  this.logger.info(
561
- `playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds5: before: ${JSON.stringify(
564
+ `playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds5: ${JSON.stringify(
562
565
  {
563
566
  fullscreen: window.isFullScreen(),
567
+ isMaximized: window.isMaximized(),
564
568
  bounds: window.getBounds(),
565
569
  contentBounds: window.getContentBounds(),
566
570
  normalBounds: window.getNormalBounds(),
@@ -568,12 +572,18 @@ export default class BrowserWindowRenderer
568
572
  )}`
569
573
  );
570
574
 
571
- window.setBounds(bounds);
575
+ if (isFullscreen(bounds) !== window.isFullScreen()) {
576
+ this.logger.info(
577
+ `playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds6: setFullScreen`
578
+ );
579
+ window.setFullScreen(isFullscreen(bounds));
580
+ }
572
581
 
573
582
  this.logger.info(
574
- `playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds6: before: ${JSON.stringify(
583
+ `playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds7: ${JSON.stringify(
575
584
  {
576
585
  fullscreen: window.isFullScreen(),
586
+ isMaximized: window.isMaximized(),
577
587
  bounds: window.getBounds(),
578
588
  contentBounds: window.getContentBounds(),
579
589
  normalBounds: window.getNormalBounds(),
@@ -583,9 +593,10 @@ export default class BrowserWindowRenderer
583
593
 
584
594
  if (window.isFullScreen() && !isFullscreen(window.getBounds())) {
585
595
  this.logger.info(
586
- `playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds7: window not fullscreen: ${JSON.stringify(
596
+ `playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds8: maximize: ${JSON.stringify(
587
597
  {
588
598
  fullscreen: window.isFullScreen(),
599
+ isMaximized: window.isMaximized(),
589
600
  bounds: window.getBounds(),
590
601
  contentBounds: window.getContentBounds(),
591
602
  normalBounds: window.getNormalBounds(),
@@ -596,9 +607,10 @@ export default class BrowserWindowRenderer
596
607
  }
597
608
 
598
609
  this.logger.info(
599
- `playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds8: last: ${JSON.stringify(
610
+ `playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds9: ${JSON.stringify(
600
611
  {
601
612
  fullscreen: window.isFullScreen(),
613
+ isMaximized: window.isMaximized(),
602
614
  bounds: window.getBounds(),
603
615
  contentBounds: window.getContentBounds(),
604
616
  normalBounds: window.getNormalBounds(),
@@ -741,6 +753,13 @@ export default class BrowserWindowRenderer
741
753
  windowId: string,
742
754
  browserWindow: BrowserWindow
743
755
  ) {
756
+ this.logger.info(
757
+ `playlist-window-manager/src/BrowserWindowRenderer.ts destroyOrUnloadPooledBrowserWindow1: ${JSON.stringify(
758
+ {
759
+ windowId,
760
+ }
761
+ )}`
762
+ );
744
763
  if (this.opts.useWindowPool) {
745
764
  this.hideWindow(windowId);
746
765
  await browserWindow.webContents.loadURL('about:blank');