microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-07-10 16:58:55 -05:00
Code Issues Packages Projects Releases 177 Wiki Activity

Have terminal use editor's hover widget styles

Browse Source 
Fixes #29542
This commit is contained in:
Daniel Imms
2017-06-28 15:11:07 -07:00
parent e3673c6b41
commit 2d0cf23f39
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/vs/workbench/parts/terminal/electron-browser/media/widgets.css
View File

@@ -17,13 +17,4 @@
line-height: 19px;
padding: 4px 5px;
animation: fadein 100ms linear;
background-color: #F3F3F3;
border: 1px solid #CCC;
}
.vs-dark .monaco-workbench .terminal-message-widget {
background-color: #2D2D30;
border-color: #555;
}
.hc-black .monaco-workbench .terminal-message-widget {
background-color: #0C141F;
}

11
src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts
View File

@@ -17,7 +17,7 @@ import { ITerminalService, ITerminalFont, TERMINAL_PANEL_ID } from 'vs/workbench
import { IThemeService, ITheme } from 'vs/platform/theme/common/themeService';
import { TerminalFindWidget } from './terminalFindWidget';
import { ansiColorIdentifiers, TERMINAL_BACKGROUND_COLOR, TERMINAL_FOREGROUND_COLOR } from './terminalColorRegistry';
import { ColorIdentifier } from 'vs/platform/theme/common/colorRegistry';
import { ColorIdentifier, editorHoverBackground, editorHoverBorder } from 'vs/platform/theme/common/colorRegistry';
import { KillTerminalAction, CreateNewTerminalAction, SwitchTerminalInstanceAction, SwitchTerminalInstanceActionItem, CopyTerminalSelectionAction, TerminalPasteAction, ClearTerminalAction, SelectAllTerminalAction } from 'vs/workbench/parts/terminal/electron-browser/terminalActions';
import { Panel } from 'vs/workbench/browser/panel';
import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
@@ -284,6 +284,15 @@ export class TerminalPanel extends Panel {
// if (selectionColor) {
// css += `.monaco-workbench .panel.integrated-terminal .xterm .xterm-selection div { background-color: ${selectionColor}; }`;
// }
// Borrow the editor's hover background for now
let hoverBackground = theme.getColor(editorHoverBackground);
if (hoverBackground) {
css += `.monaco-workbench .panel.integrated-terminal .terminal-message-widget { background-color: ${hoverBackground}; }`;
}
let hoverBorder = theme.getColor(editorHoverBorder);
if (hoverBorder) {
css += `.monaco-workbench .panel.integrated-terminal .terminal-message-widget { border: 1px solid ${hoverBorder}; }`;
}
this._themeStyleElement.innerHTML = css;
this._findWidget.updateTheme(theme);