From 99933594ec2bf8fde7a4e608a94807f0e56b2fef Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Mon, 11 Jul 2016 13:36:07 -0700 Subject: [PATCH] Add new terminal cursor blink setting Fixes #9089 --- .../terminal/electron-browser/terminal.contribution.ts | 5 +++++ .../workbench/parts/terminal/electron-browser/terminal.ts | 1 + .../terminal/electron-browser/terminalConfigHelper.ts | 7 ++++--- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts b/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts index 052cb0b9e8a..9c2bff118c7 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts +++ b/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts @@ -73,6 +73,11 @@ configurationRegistry.registerConfiguration({ 'description': nls.localize('terminal.integrated.lineHeight', "Controls the line height of the terminal, this defaults to normal."), 'type': 'number', 'default': 0 + }, + 'terminal.integrated.cursorBlinking': { + 'description': nls.localize('terminal.integrated.cursorBlinking', "Controls whether the terminal cursor blinks."), + 'type': 'boolean', + 'default': true } } }); diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminal.ts b/src/vs/workbench/parts/terminal/electron-browser/terminal.ts index 92f4198fc1e..f993972f17c 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/terminal.ts +++ b/src/vs/workbench/parts/terminal/electron-browser/terminal.ts @@ -34,6 +34,7 @@ export interface ITerminalConfiguration { linux: string[], osx: string[] }, + cursorBlinking: boolean, fontFamily: string, fontLigatures: boolean, fontSize: number, diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.ts index 896f2d574b5..9d63bbbfdd9 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.ts +++ b/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.ts @@ -136,12 +136,13 @@ export class TerminalConfigHelper { } public getFontLigaturesEnabled(): boolean { - return this.configurationService.getConfiguration().terminal.integrated.fontLigatures; + let terminalConfig = this.configurationService.getConfiguration().terminal.integrated; + return terminalConfig.fontLigatures; } public getCursorBlink(): boolean { - let editorConfig = this.configurationService.getConfiguration(); - return editorConfig.editor.cursorBlinking === 'blink'; + let terminalConfig = this.configurationService.getConfiguration().terminal.integrated; + return terminalConfig.cursorBlinking; } public getShell(): IShell { -- GitLab