diff --git a/forge.config.js b/forge.config.js index 86fe06b3..2adc3c7b 100644 --- a/forge.config.js +++ b/forge.config.js @@ -49,6 +49,7 @@ module.exports = { "node_modules/fs-ext/**", "node_modules/fsevents/**", ], + icon: "static/PromptIcon.icns", }, rebuildConfig: {}, makers: [ diff --git a/src/emain.ts b/src/emain.ts index b6d12f4c..9b7501ef 100644 --- a/src/emain.ts +++ b/src/emain.ts @@ -92,7 +92,7 @@ function ensureDir(dir) { } let app = electron.app; -app.setName("Prompt"); +app.setName("prompt"); let lock : File; try { diff --git a/src/sh2.less b/src/sh2.less index 1ea2956c..881c9d05 100644 --- a/src/sh2.less +++ b/src/sh2.less @@ -408,10 +408,6 @@ html, body, #main { } } - &.focus { - background-color: #000; - } - &.has-rtnstate .terminal-wrapper { padding-bottom: 0; margin-bottom: -5px; @@ -429,10 +425,6 @@ html, body, #main { display: none; } - &.focus { - /* box-shadow: 0 0 3px 3px rgba(255, 255, 255, 0.3); */ - } - .terminal-connectelem { overflow-y: hidden; overflow-x: hidden; diff --git a/src/term.ts b/src/term.ts index 9aa192fc..250a32a7 100644 --- a/src/term.ts +++ b/src/term.ts @@ -136,6 +136,7 @@ class TermWrap { focusTerminal() { this.terminal.focus(); + setTimeout(() => this.terminal._core.viewport.syncScrollArea(true), 0) } disconnectElem() { @@ -283,7 +284,8 @@ class TermWrap { return; } if (pos > this.ptyPos) { - throw new Error(sprintf("invalid pty-update, data-pos[%d] does not match term-pos[%d] cmdid[%s]", pos, this.ptyPos, JSON.stringify(this.termContext))); + console.log(sprintf("pty-jump term[%s] %d => %d", JSON.stringify(this.termContext), this.ptyPos, pos)); + this.ptyPos = pos; } if (pos < this.ptyPos) { let diff = this.ptyPos - pos; diff --git a/static/PromptIcon.icns b/static/PromptIcon.icns new file mode 100644 index 00000000..d1c1854b Binary files /dev/null and b/static/PromptIcon.icns differ