maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Revert "Implement terminal scroll bar"

Browse source 
Going to hold off on this until sourcelair/xterm.js#224 is merged.

This reverts commit 0a5a071cea.
This commit is contained in:
Daniel Imms 2016-08-08 15:22:26 -07:00
parent 0a5a071cea
commit 590f21f71c
6 changed files with 4 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
npm-shrinkwrap.json generated
View file

@ -429,8 +429,8 @@
},
"xterm": {
"version": "1.0.0",
"from": "git+https://github.com/sourcelair/xterm.js.git#e7c7160",
"resolved": "git+https://github.com/sourcelair/xterm.js.git#e7c7160f8549eede0f069d3b8512642f3498f9fe"
"from": "git+https://github.com/sourcelair/xterm.js.git#65b2be7",
"resolved": "git+https://github.com/sourcelair/xterm.js.git#65b2be78315e0c83defb7d8358eb0282a18024a0"
},
"yauzl": {
"version": "2.3.1",

2
package.json
View file

@ -30,7 +30,7 @@
"vscode-debugprotocol": "1.11.0",
"vscode-textmate": "2.0.1",
"winreg": "1.2.0",
"xterm": "git+https://github.com/sourcelair/xterm.js.git#e7c7160",
"xterm": "git+https://github.com/sourcelair/xterm.js.git#65b2be7",
"yauzl": "2.3.1"
},
"devDependencies": {

40
src/vs/workbench/parts/terminal/electron-browser/media/scrollbar.css
View file

@ -1,40 +0,0 @@
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
.monaco-workbench .panel.integrated-terminal .xterm-viewport {
/* Use the hack presented in http://stackoverflow.com/a/38748186/1156119 to get opacity transitions working on the scrollbar */
background-color: rgba(121, 121, 121, 0);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
transition: background-color 800ms linear;
}
.monaco-workbench .panel.integrated-terminal .xterm-viewport::-webkit-scrollbar {
width: 10px;
}
.monaco-workbench .panel.integrated-terminal .xterm-viewport::-webkit-scrollbar-track {
opacity: 0;
}
.monaco-workbench .panel.integrated-terminal .xterm-viewport::-webkit-scrollbar-thumb {
background-color: inherit;
}
.monaco-workbench .panel.integrated-terminal .xterm.focus .xterm-viewport,
.monaco-workbench .panel.integrated-terminal .xterm:focus .xterm-viewport,
.monaco-workbench .panel.integrated-terminal .xterm:hover .xterm-viewport {
transition: opacity 100ms linear;
background-color: rgba(121, 121, 121, 0.4);
}
.monaco-workbench .panel.integrated-terminal .xterm .xterm-viewport::-webkit-scrollbar-thumb:hover {
transition: opacity 0ms linear;
background-color: rgba(100, 100, 100, .7);
}
.monaco-workbench .panel.integrated-terminal .xterm .xterm-viewport::-webkit-scrollbar-thumb:window-inactive {
background-color: inherit;
}

21
src/vs/workbench/parts/terminal/electron-browser/media/xterm.css
View file

@ -119,27 +119,6 @@
}
}
.monaco-workbench .panel.integrated-terminal .xterm .xterm-viewport {
overflow-y: scroll;
}
.monaco-workbench .panel.integrated-terminal .xterm .xterm-rows {
position: absolute;
left: 0;
bottom: 0;
}
.monaco-workbench .panel.integrated-terminal .xterm .xterm-scroll-area {
visibility: hidden;
}
.monaco-workbench .panel.integrated-terminal .xterm .xterm-char-measure-element {
display: inline-block;
visibility: hidden;
position: absolute;
left: -9999em;
}
.monaco-workbench .panel.integrated-terminal .xterm .xterm-bold {
font-weight: bold;
}

1
src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
View file

@ -3,7 +3,6 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import 'vs/css!./media/scrollbar';
import 'vs/css!./media/terminal';
import 'vs/css!./media/xterm';
import * as panel from 'vs/workbench/browser/panel';

5
src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
View file

@ -135,13 +135,10 @@ export class TerminalInstance {
if (!dimension.height) { // Minimized
return;
}
let leftPadding = parseInt(getComputedStyle(document.querySelector('.terminal-outer-container')).paddingLeft.split('px')[0], 10);
let innerWidth = dimension.width - leftPadding;
let cols = Math.floor(innerWidth / this.font.charWidth);
let cols = Math.floor(dimension.width / this.font.charWidth);
let rows = Math.floor(dimension.height / this.font.charHeight);
if (this.xterm) {
this.xterm.resize(cols, rows);
this.xterm.element.style.width = innerWidth + 'px';
}
if (this.terminalProcess.process.connected) {
this.terminalProcess.process.send({