Skip to content

Commit 2d0cf23

Browse files
committed
Have terminal use editor's hover widget styles
Fixes microsoft#29542
1 parent e3673c6 commit 2d0cf23

2 files changed

Lines changed: 10 additions & 10 deletions

File tree

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,4 @@
1717
line-height: 19px;
1818
padding: 4px 5px;
1919
animation: fadein 100ms linear;
20-
background-color: #F3F3F3;
21-
border: 1px solid #CCC;
22-
}
23-
.vs-dark .monaco-workbench .terminal-message-widget {
24-
background-color: #2D2D30;
25-
border-color: #555;
26-
}
27-
.hc-black .monaco-workbench .terminal-message-widget {
28-
background-color: #0C141F;
2920
}

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import { ITerminalService, ITerminalFont, TERMINAL_PANEL_ID } from 'vs/workbench
1717
import { IThemeService, ITheme } from 'vs/platform/theme/common/themeService';
1818
import { TerminalFindWidget } from './terminalFindWidget';
1919
import { ansiColorIdentifiers, TERMINAL_BACKGROUND_COLOR, TERMINAL_FOREGROUND_COLOR } from './terminalColorRegistry';
20-
import { ColorIdentifier } from 'vs/platform/theme/common/colorRegistry';
20+
import { ColorIdentifier, editorHoverBackground, editorHoverBorder } from 'vs/platform/theme/common/colorRegistry';
2121
import { KillTerminalAction, CreateNewTerminalAction, SwitchTerminalInstanceAction, SwitchTerminalInstanceActionItem, CopyTerminalSelectionAction, TerminalPasteAction, ClearTerminalAction, SelectAllTerminalAction } from 'vs/workbench/parts/terminal/electron-browser/terminalActions';
2222
import { Panel } from 'vs/workbench/browser/panel';
2323
import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
@@ -284,6 +284,15 @@ export class TerminalPanel extends Panel {
284284
// if (selectionColor) {
285285
// css += `.monaco-workbench .panel.integrated-terminal .xterm .xterm-selection div { background-color: ${selectionColor}; }`;
286286
// }
287+
// Borrow the editor's hover background for now
288+
let hoverBackground = theme.getColor(editorHoverBackground);
289+
if (hoverBackground) {
290+
css += `.monaco-workbench .panel.integrated-terminal .terminal-message-widget { background-color: ${hoverBackground}; }`;
291+
}
292+
let hoverBorder = theme.getColor(editorHoverBorder);
293+
if (hoverBorder) {
294+
css += `.monaco-workbench .panel.integrated-terminal .terminal-message-widget { border: 1px solid ${hoverBorder}; }`;
295+
}
287296

288297
this._themeStyleElement.innerHTML = css;
289298
this._findWidget.updateTheme(theme);

0 commit comments

Comments
 (0)