Eugeny/tabby
1
1
Fork 0
mirror of https://github.com/Eugeny/tabby.git synced 2024-12-26 03:51:49 +03:00
Code Issues Projects Releases Wiki Activity

bumped electron

Browse Source
This commit is contained in:
Eugene Pankov 2018-10-23 11:45:16 +02:00
parent c8e1c17514
commit a4ccbfa857
3 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -12,7 +12,7 @@
"core-js": "2.4.1", "core-js": "2.4.1",
"cross-env": "4.0.0", "cross-env": "4.0.0",
"css-loader": "0.28.0", "css-loader": "0.28.0",
"electron": "3.0.0", "electron": "3.0.5",
"electron-builder": "^20.27.1", "electron-builder": "^20.27.1",
"electron-builder-squirrel-windows": "^20.28.3", "electron-builder-squirrel-windows": "^20.28.3",
"electron-installer-snap": "^3.0.0", "electron-installer-snap": "^3.0.0",

24
terminus-terminal/src/frontends/htermFrontend.ts
View File

@ -52,9 +52,6 @@ export class HTermFrontend extends Frontend {
} }
configure (config: any): void { configure (config: any): void {
if (!this.term) {
return
}
this.configuredFontSize = config.terminal.fontSize this.configuredFontSize = config.terminal.fontSize
this.configuredLinePadding = config.terminal.linePadding this.configuredLinePadding = config.terminal.linePadding
this.setFontSize() this.setFontSize()
@ -91,14 +88,8 @@ export class HTermFrontend extends Frontend {
this.configuredBackgroundColor = preferenceManager.get('background-color') this.configuredBackgroundColor = preferenceManager.get('background-color')
if (config.terminal.colorScheme.colors) { if (!this.term) {
preferenceManager.set( return
'color-palette-overrides',
Object.assign([], config.terminal.colorScheme.colors, this.term.colorPaletteOverrides)
)
}
if (config.terminal.colorScheme.cursor) {
preferenceManager.set('cursor-color', config.terminal.colorScheme.cursor)
} }
let css = require('../hterm.userCSS.scss') let css = require('../hterm.userCSS.scss')
@ -119,6 +110,17 @@ export class HTermFrontend extends Frontend {
} }
css += config.appearance.css css += config.appearance.css
this.term.setCSS(css) this.term.setCSS(css)
if (config.terminal.colorScheme.colors) {
preferenceManager.set(
'color-palette-overrides',
Object.assign([], config.terminal.colorScheme.colors, this.term.colorPaletteOverrides)
)
}
if (config.terminal.colorScheme.cursor) {
preferenceManager.set('cursor-color', config.terminal.colorScheme.cursor)
}
this.term.setBracketedPaste(config.terminal.bracketedPaste) this.term.setBracketedPaste(config.terminal.bracketedPaste)
this.term.defaultCursorShape = { this.term.defaultCursorShape = {
block: hterm.hterm.Terminal.cursorShape.BLOCK, block: hterm.hterm.Terminal.cursorShape.BLOCK,

8
yarn.lock
View File

@ -2166,10 +2166,10 @@ electron-to-chromium@^1.2.7:
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.58.tgz#8267a4000014e93986d9d18c65a8b4022ca75188" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.58.tgz#8267a4000014e93986d9d18c65a8b4022ca75188"
integrity sha512-AGJxlBEn2wOohxqWZkISVsOjZueKTQljfEODTDSEiMqSpH0S+xzV+/5oEM9AGaqhu7DzrpKOgU7ocQRjj0nJmg== integrity sha512-AGJxlBEn2wOohxqWZkISVsOjZueKTQljfEODTDSEiMqSpH0S+xzV+/5oEM9AGaqhu7DzrpKOgU7ocQRjj0nJmg==
electron@3.0.0: electron@3.0.5:
version "3.0.0" version "3.0.5"
resolved "https://registry.yarnpkg.com/electron/-/electron-3.0.0.tgz#d41e671b1057aee12021c63a5db242075d6dc685" resolved "https://registry.yarnpkg.com/electron/-/electron-3.0.5.tgz#5a6f105af3b6314636c7c27a25312602dd36eae6"
integrity sha512-QN9X5vYa4kzJKniwhXlJwioX9qw2fDehdqxN/00KCLz/qnOz/IHLAHGikFjRwfEF2xnkmHxf61F8wn2LePPXXQ== integrity sha512-rcHNbhSGfj80Av5p06LgIUxN8wQbrdx8yblikJamDezqxe0B11CJSEJuidz6TJoCRDZuWHt+P5xMAEhp92ZUcA==
dependencies: dependencies:
"@types/node" "^8.0.24" "@types/node" "^8.0.24"
electron-download "^4.1.0" electron-download "^4.1.0"