From fa6fa3f1ea1e2495d16efb876969a2ec9e97d85a Mon Sep 17 00:00:00 2001 From: Austin Warren Date: Fri, 28 Jun 2019 12:35:08 -0700 Subject: [PATCH 1/7] Fix default value to fit within dockFill boundaries --- terminus-core/src/configDefaults.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terminus-core/src/configDefaults.yaml b/terminus-core/src/configDefaults.yaml index 332eee95..71fb6b58 100644 --- a/terminus-core/src/configDefaults.yaml +++ b/terminus-core/src/configDefaults.yaml @@ -1,7 +1,7 @@ appearance: dock: off dockScreen: current - dockFill: 50 + dockFill: 0.5 tabsLocation: top cycleTabs: true theme: Standard From 38494c970467d511a5033e43b5c5b412494a9544 Mon Sep 17 00:00:00 2001 From: Austin Warren Date: Fri, 28 Jun 2019 13:26:17 -0700 Subject: [PATCH 2/7] Properly identify primary display and ensure all screens are sorted by their X/Y bounds --- terminus-core/src/services/docking.service.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/terminus-core/src/services/docking.service.ts b/terminus-core/src/services/docking.service.ts index 20f368db..fd8a28ea 100644 --- a/terminus-core/src/services/docking.service.ts +++ b/terminus-core/src/services/docking.service.ts @@ -63,15 +63,15 @@ export class DockingService { } getScreens () { - return this.electron.screen.getAllDisplays().map((display, index) => { + const primaryDisplayID = this.electron.screen.getPrimaryDisplay().id; + return this.electron.screen.getAllDisplays().sort((a,b) => ( + a.bounds.x === b.bounds.x ? a.bounds.y - b.bounds.y : a.bounds.x - b.bounds.x + )).map((display,index) => { return { id: display.id, - name: [ - 'Primary display', - 'Secondary display', - ][index] || `Display ${index + 1}`, + name: display.id === primaryDisplayID ? 'Primary Display' : `Display ${index +1}`, } - }) + }); } private repositionWindow () { From be2f2f4575c403e4885eb280a383a2e4568cc20c Mon Sep 17 00:00:00 2001 From: Austin Warren Date: Fri, 28 Jun 2019 13:27:41 -0700 Subject: [PATCH 3/7] Ensure our list of screens is up to date when we add/remove/modify screen settings --- .../src/components/settingsTab.component.ts | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/terminus-settings/src/components/settingsTab.component.ts b/terminus-settings/src/components/settingsTab.component.ts index 23ebff1c..454f11b4 100644 --- a/terminus-settings/src/components/settingsTab.component.ts +++ b/terminus-settings/src/components/settingsTab.component.ts @@ -1,7 +1,7 @@ import * as yaml from 'js-yaml' import * as os from 'os' import { Subscription } from 'rxjs' -import { Component, Inject, Input, HostBinding } from '@angular/core' +import { Component, Inject, Input, HostBinding, NgZone } from '@angular/core' import { ElectronService, DockingService, @@ -47,6 +47,7 @@ export class SettingsTabComponent extends BaseTabComponent { public hostApp: HostAppService, public homeBase: HomeBaseService, public shellIntegration: ShellIntegrationService, + public zone: NgZone, hotkeys: HotkeysService, @Inject(SettingsTabProvider) public settingsProviders: SettingsTabProvider[], @Inject(Theme) public themes: Theme[], @@ -68,6 +69,14 @@ export class SettingsTabComponent extends BaseTabComponent { this.configSubscription = config.changed$.subscribe(onConfigChange) onConfigChange() + const onScreenChange = () => { + this.zone.run(() => this.screens = this.docking.getScreens()); + } + + electron.screen.on('display-added', onScreenChange); + electron.screen.on('display-removed', onScreenChange); + electron.screen.on('display-metrics-changed', onScreenChange); + hotkeys.getHotkeyDescriptions().then(descriptions => { this.hotkeyDescriptions = descriptions }) From 0238515b42d751640e917378a42f993f2ed33cfd Mon Sep 17 00:00:00 2001 From: Austin Warren Date: Fri, 28 Jun 2019 13:48:06 -0700 Subject: [PATCH 4/7] Ensure that users with old default config don't end up with an out of bounds window --- terminus-core/src/services/docking.service.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/terminus-core/src/services/docking.service.ts b/terminus-core/src/services/docking.service.ts index fd8a28ea..a4a0289f 100644 --- a/terminus-core/src/services/docking.service.ts +++ b/terminus-core/src/services/docking.service.ts @@ -30,7 +30,8 @@ export class DockingService { } const newBounds: Bounds = { x: 0, y: 0, width: 0, height: 0 } - const fill = this.config.store.appearance.dockFill + + const fill = this.config.store.appearance.dockFill <= 1 ? this.config.store.appearance.dockFill : 1; const [minWidth, minHeight] = this.hostApp.getWindow().getMinimumSize() if (dockSide === 'left' || dockSide === 'right') { From 4775632c513952ab6e74f73470b8bdfa7e5f6056 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2019 04:36:34 +0000 Subject: [PATCH 5/7] Bump xterm from 3.15.0-beta61 to 3.15.0-beta65 in /terminus-terminal Bumps [xterm](https://github.com/xtermjs/xterm.js) from 3.15.0-beta61 to 3.15.0-beta65. - [Release notes](https://github.com/xtermjs/xterm.js/releases) - [Commits](https://github.com/xtermjs/xterm.js/commits) Signed-off-by: dependabot-preview[bot] --- terminus-terminal/package.json | 2 +- terminus-terminal/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/terminus-terminal/package.json b/terminus-terminal/package.json index 6793a6e0..84a9867c 100644 --- a/terminus-terminal/package.json +++ b/terminus-terminal/package.json @@ -31,7 +31,7 @@ "runes": "^0.4.2", "slug": "^1.1.0", "uuid": "^3.3.2", - "xterm": "3.15.0-beta61", + "xterm": "3.15.0-beta65", "xterm-addon-fit": "^0.1.0-beta3", "xterm-addon-ligatures": "^0.1.0-beta-2", "xterm-addon-search": "^0.1.0-beta6", diff --git a/terminus-terminal/yarn.lock b/terminus-terminal/yarn.lock index fdfe6f66..e7a19d20 100644 --- a/terminus-terminal/yarn.lock +++ b/terminus-terminal/yarn.lock @@ -231,10 +231,10 @@ xterm-addon-webgl@^0.2.0-beta1: resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.2.0-beta1.tgz#c688e4b26bbd01a8a0cd9143362bbe040fc98ef9" integrity sha512-arDNdOyiGs0BCFUaQ0jEa1UgybqMsMRZwV9+/xc0D4vJi5STWtH8lRtTUAgvDxaTJQBo1frz56JkYpDddHDSXw== -xterm@3.15.0-beta61: - version "3.15.0-beta61" - resolved "https://registry.yarnpkg.com/xterm/-/xterm-3.15.0-beta61.tgz#44f3b1959c955013d0661b7008c33a913f900329" - integrity sha512-nPr9DQCUnAnC8COoL5QfZqdFADj6nD+03xsqfu+6DLJAY0BPF0Tdhm+VzWlB4GGEhjA/DEuTD5vq70+j3gE/bw== +xterm@3.15.0-beta65: + version "3.15.0-beta65" + resolved "https://registry.yarnpkg.com/xterm/-/xterm-3.15.0-beta65.tgz#ec2d5bc32716c7536e2b1d83764e0f8b1adc453f" + integrity sha512-rEngAALvVMos8W0sY6bDnSqVRmkwvGtCnaRMsx5tOsVXbehhjcQmkvZCgUe3ZSxaS7Pcz9fpXm6fjllgmgnGyA== yallist@^2.1.2: version "2.1.2" From 85755552047b08a5632f8d777e89dbe5df805bbf Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2019 04:37:58 +0000 Subject: [PATCH 6/7] Bump node-pty from 0.9.0-beta9 to 0.9.0-beta18 in /app Bumps [node-pty](https://github.com/Tyriar/node-pty) from 0.9.0-beta9 to 0.9.0-beta18. - [Release notes](https://github.com/Tyriar/node-pty/releases) - [Commits](https://github.com/Tyriar/node-pty/commits) Signed-off-by: dependabot-preview[bot] --- app/package.json | 2 +- app/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/package.json b/app/package.json index a051d900..c879524c 100644 --- a/app/package.json +++ b/app/package.json @@ -31,7 +31,7 @@ "keytar": "^4.7.0", "mz": "^2.7.0", "ngx-toastr": "^10.0.4", - "node-pty": "^0.9.0-beta9", + "node-pty": "^0.9.0-beta18", "npm": "~6.9.0", "path": "0.12.7", "rxjs": "^6.5.2", diff --git a/app/yarn.lock b/app/yarn.lock index b7875b92..02bf9c61 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -2025,10 +2025,10 @@ node-gyp@^4.0.0: tar "^4.4.8" which "1" -node-pty@^0.9.0-beta9: - version "0.9.0-beta9" - resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-0.9.0-beta9.tgz#75cffcf4026f543475c115f017ca7fe66cf6e7fe" - integrity sha512-h6e8jUikGSZwqt1JHmzT5Zi0fdUCultX/BWrS35suTaZNJm/YSJA2QDG9HTVoSA6dhRvtFoaGiBtgbX9uZKe6w== +node-pty@^0.9.0-beta18: + version "0.9.0-beta18" + resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-0.9.0-beta18.tgz#d81c1ed96ee2727043abd5ac6666250149c1b606" + integrity sha512-j4E8RYda9cqm+2cGxaAxDlpEmPpuS0dfCuZII8VPRTw6p5gRJRwPJo9oL//YKdtaasRFfRy0/mUaNj8ft3FQVg== dependencies: nan "^2.13.2" From 911b72508bed1ffc9e58a61f2576ef129351ab87 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2019 04:39:01 +0000 Subject: [PATCH 7/7] Bump electron-debug from 3.0.0 to 3.0.1 in /app Bumps [electron-debug](https://github.com/sindresorhus/electron-debug) from 3.0.0 to 3.0.1. - [Release notes](https://github.com/sindresorhus/electron-debug/releases) - [Commits](https://github.com/sindresorhus/electron-debug/compare/v3.0.0...v3.0.1) Signed-off-by: dependabot-preview[bot] --- app/package.json | 2 +- app/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/package.json b/app/package.json index a051d900..ba752876 100644 --- a/app/package.json +++ b/app/package.json @@ -24,7 +24,7 @@ "devtron": "1.4.0", "fontmanager-redux": "0.3.2", "electron-config": "2.0.0", - "electron-debug": "^3.0.0", + "electron-debug": "^3.0.1", "electron-is-dev": "1.1.0", "electron-updater": "^4.0.6", "js-yaml": "3.13.1", diff --git a/app/yarn.lock b/app/yarn.lock index b7875b92..0748f397 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -786,10 +786,10 @@ electron-config@2.0.0: dependencies: conf "^1.0.0" -electron-debug@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/electron-debug/-/electron-debug-3.0.0.tgz#55b7895df7f371558d0595d14dc2f8a738a41c81" - integrity sha512-rLrnn7L2soeIqwB6FIzn4+pj6RwT66XhUxadcrS3okjB3ezAv8LsolqrFrO2UrTrvchZgTCcEapV4J0UxlYWIw== +electron-debug@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/electron-debug/-/electron-debug-3.0.1.tgz#95b43b968ec7dbe96300034143e58b803a1e82dc" + integrity sha512-fo3mtDM4Bxxm3DW1I+XcJKfQlUlns4QGWyWGs8OrXK1bBZ2X9HeqYMntYBx78MYRcGY5S/ualuG4GhCnPlaZEA== dependencies: electron-is-dev "^1.1.0" electron-localshortcut "^3.1.0"