Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use canvas to render the terminal #33954

Merged
merged 25 commits into from
Sep 10, 2017
Merged
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
78be8b3
Update typings
Tyriar Sep 3, 2017
6894327
Add CSS changes
Tyriar Sep 3, 2017
447b1e1
Get fonts displaying correctly
Tyriar Sep 3, 2017
fbd6419
Support lineHeight
Tyriar Sep 3, 2017
c6b2dd5
Align terminal to bottom
Tyriar Sep 3, 2017
0d022d5
Fix lineHeight for terminal char measure object
Tyriar Sep 3, 2017
993aea8
Fix default terminal line height
Tyriar Sep 3, 2017
977fd77
Make fontSize a number
Tyriar Sep 3, 2017
5a1a34f
Merge remote-tracking branch 'origin/master' into tyriar/canvas_terminal
Tyriar Sep 6, 2017
72af20c
Partial support for new link API
Tyriar Sep 6, 2017
8ada816
Use new tooltip callback
Tyriar Sep 7, 2017
500240a
Merge remote-tracking branch 'origin/master' into tyriar/canvas_terminal
Tyriar Sep 7, 2017
26f1b9a
Merge remote-tracking branch 'origin/master' into tyriar/canvas_terminal
Tyriar Sep 7, 2017
6d7e0df
Fix unit tests
Tyriar Sep 8, 2017
dea0bf6
Merge remote-tracking branch 'origin/master' into tyriar/canvas_terminal
Tyriar Sep 8, 2017
b982b56
Don't require panel to exist for xterm.js to init
Tyriar Sep 8, 2017
055b8b4
Uplevel xterm.js
Tyriar Sep 10, 2017
62afc94
Uplevel xterm.js
Tyriar Sep 10, 2017
61cef0a
Support new terminal theme model
Tyriar Sep 10, 2017
7df8d06
Support terminal.selectionBackground theme key
Tyriar Sep 10, 2017
9746e5c
Add copyright statement
Tyriar Sep 10, 2017
379070d
Tweak terminal selection defaults
Tyriar Sep 10, 2017
ab8ebea
Uplevel xterm.js
Tyriar Sep 10, 2017
27c1918
Fix font/line height size issues
Tyriar Sep 10, 2017
02c75d2
Remove enableBold and fontLigratures terminal settings
Tyriar Sep 10, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Remove enableBold and fontLigratures terminal settings
Tyriar committed Sep 10, 2017
commit 02c75d263d8703e992f58476cdb62caf12213634
4 changes: 2 additions & 2 deletions src/vs/workbench/parts/terminal/common/terminal.ts
Original file line number Diff line number Diff line change
@@ -58,12 +58,12 @@ export interface ITerminalConfiguration {
osx: string[];
windows: string[];
};
enableBold: boolean;
// enableBold: boolean;
rightClickCopyPaste: boolean;
cursorBlinking: boolean;
cursorStyle: string;
fontFamily: string;
fontLigatures: boolean;
// fontLigatures: boolean;
fontSize: number;
lineHeight: number;
setLocaleVariables: boolean;
Original file line number Diff line number Diff line change
@@ -120,11 +120,12 @@ configurationRegistry.registerConfiguration({
'description': nls.localize('terminal.integrated.fontFamily', "Controls the font family of the terminal, this defaults to editor.fontFamily's value."),
'type': 'string'
},
'terminal.integrated.fontLigatures': {
'description': nls.localize('terminal.integrated.fontLigatures', "Controls whether font ligatures are enabled in the terminal."),
'type': 'boolean',
'default': false
},
// TODO: Support font ligatures
// 'terminal.integrated.fontLigatures': {
// 'description': nls.localize('terminal.integrated.fontLigatures', "Controls whether font ligatures are enabled in the terminal."),
// 'type': 'boolean',
// 'default': false
// },
'terminal.integrated.fontSize': {
'description': nls.localize('terminal.integrated.fontSize', "Controls the font size in pixels of the terminal."),
'type': 'number',
@@ -135,11 +136,11 @@ configurationRegistry.registerConfiguration({
'type': 'number',
'default': 1
},
'terminal.integrated.enableBold': {
'type': 'boolean',
'description': nls.localize('terminal.integrated.enableBold', "Whether to enable bold text within the terminal, this requires support from the terminal shell."),
'default': true
},
// 'terminal.integrated.enableBold': {
// 'type': 'boolean',
// 'description': nls.localize('terminal.integrated.enableBold', "Whether to enable bold text within the terminal, this requires support from the terminal shell."),
// 'default': true
// },
'terminal.integrated.cursorBlinking': {
'description': nls.localize('terminal.integrated.cursorBlinking', "Controls whether the terminal cursor blinks."),
'type': 'boolean',