@raydiant/playlist-window-manager 0.0.0-test-22 → 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 +2 -2
  3. package/src/BrowserWindowRenderer.ts +37 -12
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-22",
3
+ "version": "0.0.0-test-24",
4
4
  "description": "Window manager for playlist playback.",
5
5
  "main": "build/index.js",
6
6
  "scripts": {
@@ -24,7 +24,7 @@
24
24
  "@types/jschannel": "^1.0.1",
25
25
  "@types/lodash": "^4.14.200",
26
26
  "@types/uuid": "8.3.0",
27
- "electron": "10.1.5",
27
+ "electron": "27.0.2",
28
28
  "jest": "^24.8.0",
29
29
  "ts-jest": "^24.0.2",
30
30
  "typescript": "^4.1.2"
package/src/BrowserWindowRenderer.ts CHANGED
@@ -6,7 +6,7 @@ import {
6
6
  screen,
7
7
  IpcMainEvent,
8
8
  Event,
9
- Details,
9
+ RenderProcessGoneDetails,
10
10
  BrowserWindowConstructorOptions,
11
11
  BrowserViewConstructorOptions,
12
12
  } from 'electron';
@@ -35,7 +35,10 @@ interface BrowserWindowRendererWindow {
35
35
  payload?: any
36
36
  ) => void;
37
37
  unresponsiveCallback: () => void;
38
- renderProcessGoneCallback: (event: Event, details: Details) => void;
38
+ renderProcessGoneCallback: (
39
+ event: Event,
40
+ details: RenderProcessGoneDetails
41
+ ) => void;
39
42
  }
40
43
 
41
44
  interface BrowserWindowRendererOptions {
@@ -180,7 +183,10 @@ export default class BrowserWindowRenderer
180
183
  );
181
184
  },
182
185
 
183
- renderProcessGoneCallback: (_: Event, details: Details) => {
186
+ renderProcessGoneCallback: (
187
+ _: Event,
188
+ details: RenderProcessGoneDetails
189
+ ) => {
184
190
  this.logger.error(
185
191
  `Window received 'render-process-gone' event. Reason: ${details.reason}`,
186
192
  { windowId }
@@ -354,7 +360,7 @@ export default class BrowserWindowRenderer
354
360
 
355
361
  public showWindow(windowId: string, isFocused: boolean) {
356
362
  this.logger.info(
357
- `playlist-window-manager/src/BrowserWindowRenderer.ts showWindow1`
363
+ `playlist-window-manager/src/BrowserWindowRenderer.ts showWindow1: ${windowId}`
358
364
  );
359
365
  const window = this.getWindow(windowId);
360
366
  const windowBounds = this.getWindowBounds(windowId);
@@ -367,6 +373,7 @@ export default class BrowserWindowRenderer
367
373
  `playlist-window-manager/src/BrowserWindowRenderer.ts showWindow2: ${JSON.stringify(
368
374
  {
369
375
  fullscreen: window.view.isFullScreen(),
376
+ isMaximized: window.view.isMaximized(),
370
377
  bounds: window.view.getBounds(),
371
378
  windowBounds: windowBounds,
372
379
  normalBounds: window.view.getNormalBounds(),
@@ -385,6 +392,7 @@ export default class BrowserWindowRenderer
385
392
  `playlist-window-manager/src/BrowserWindowRenderer.ts showWindow4: ${JSON.stringify(
386
393
  {
387
394
  fullscreen: window.view.isFullScreen(),
395
+ isMaximized: window.view.isMaximized(),
388
396
  bounds: window.view.getBounds(),
389
397
  normalBounds: window.view.getNormalBounds(),
390
398
  contentBounds: window.view.getContentBounds(),
@@ -528,6 +536,7 @@ export default class BrowserWindowRenderer
528
536
  {
529
537
  newBounds: bounds,
530
538
  fullscreen: window.isFullScreen(),
539
+ isMaximized: window.isMaximized(),
531
540
  bounds: window.getBounds(),
532
541
  contentBounds: window.getContentBounds(),
533
542
  normalBounds: window.getNormalBounds(),
@@ -544,17 +553,18 @@ export default class BrowserWindowRenderer
544
553
  return;
545
554
  }
546
555
 
547
- if (isFullscreen(bounds) !== window.isFullScreen()) {
556
+ if (!areBoundsEqual(window.getBounds(), bounds)) {
548
557
  this.logger.info(
549
- `playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds4: setFullScreen`
558
+ `playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds4: setBounds`
550
559
  );
551
- window.setFullScreen(isFullscreen(bounds));
560
+ window.setBounds(bounds);
552
561
  }
553
562
 
554
563
  this.logger.info(
555
- `playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds5: before: ${JSON.stringify(
564
+ `playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds5: ${JSON.stringify(
556
565
  {
557
566
  fullscreen: window.isFullScreen(),
567
+ isMaximized: window.isMaximized(),
558
568
  bounds: window.getBounds(),
559
569
  contentBounds: window.getContentBounds(),
560
570
  normalBounds: window.getNormalBounds(),
@@ -562,12 +572,18 @@ export default class BrowserWindowRenderer
562
572
  )}`
563
573
  );
564
574
 
565
- 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
+ }
566
581
 
567
582
  this.logger.info(
568
- `playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds6: before: ${JSON.stringify(
583
+ `playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds7: ${JSON.stringify(
569
584
  {
570
585
  fullscreen: window.isFullScreen(),
586
+ isMaximized: window.isMaximized(),
571
587
  bounds: window.getBounds(),
572
588
  contentBounds: window.getContentBounds(),
573
589
  normalBounds: window.getNormalBounds(),
@@ -577,9 +593,10 @@ export default class BrowserWindowRenderer
577
593
 
578
594
  if (window.isFullScreen() && !isFullscreen(window.getBounds())) {
579
595
  this.logger.info(
580
- `playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds7: window not fullscreen: ${JSON.stringify(
596
+ `playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds8: maximize: ${JSON.stringify(
581
597
  {
582
598
  fullscreen: window.isFullScreen(),
599
+ isMaximized: window.isMaximized(),
583
600
  bounds: window.getBounds(),
584
601
  contentBounds: window.getContentBounds(),
585
602
  normalBounds: window.getNormalBounds(),
@@ -590,9 +607,10 @@ export default class BrowserWindowRenderer
590
607
  }
591
608
 
592
609
  this.logger.info(
593
- `playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds8: last: ${JSON.stringify(
610
+ `playlist-window-manager/src/BrowserWindowRenderer.ts setWindowOrViewBounds9: ${JSON.stringify(
594
611
  {
595
612
  fullscreen: window.isFullScreen(),
613
+ isMaximized: window.isMaximized(),
596
614
  bounds: window.getBounds(),
597
615
  contentBounds: window.getContentBounds(),
598
616
  normalBounds: window.getNormalBounds(),
@@ -735,6 +753,13 @@ export default class BrowserWindowRenderer
735
753
  windowId: string,
736
754
  browserWindow: BrowserWindow
737
755
  ) {
756
+ this.logger.info(
757
+ `playlist-window-manager/src/BrowserWindowRenderer.ts destroyOrUnloadPooledBrowserWindow1: ${JSON.stringify(
758
+ {
759
+ windowId,
760
+ }
761
+ )}`
762
+ );
738
763
  if (this.opts.useWindowPool) {
739
764
  this.hideWindow(windowId);
740
765
  await browserWindow.webContents.loadURL('about:blank');