From 94687d50dfd7dbfe873f776d34a7328c2db30893 Mon Sep 17 00:00:00 2001 From: BeniBenj Date: Sun, 10 Dec 2023 11:58:52 +0100 Subject: [PATCH] Terminal theme icon support --- .../contrib/terminal/browser/media/terminal.css | 5 ----- .../contrib/terminal/browser/terminalEditorInput.ts | 12 ++++++++---- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/vs/workbench/contrib/terminal/browser/media/terminal.css b/src/vs/workbench/contrib/terminal/browser/media/terminal.css index a934dae26c7..488815cf258 100644 --- a/src/vs/workbench/contrib/terminal/browser/media/terminal.css +++ b/src/vs/workbench/contrib/terminal/browser/media/terminal.css @@ -58,11 +58,6 @@ opacity: 0 !important; } -.monaco-workbench .terminal-tab::before { - font-family: 'codicon' !important; - font-size: 16px !important; -} - .monaco-workbench .terminal-tab:not(.terminal-uri-icon)::before { background-image: none !important; } diff --git a/src/vs/workbench/contrib/terminal/browser/terminalEditorInput.ts b/src/vs/workbench/contrib/terminal/browser/terminalEditorInput.ts index 2c4cafe5172..94d3ce8960a 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminalEditorInput.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminalEditorInput.ts @@ -191,11 +191,18 @@ export class TerminalEditorInput extends EditorInput implements IEditorCloseHand return this._terminalInstance?.title || this.resource.fragment; } + override getIcon(): ThemeIcon | undefined { + if (!this._terminalInstance || !ThemeIcon.isThemeIcon(this._terminalInstance.icon)) { + return undefined; + } + return this._terminalInstance.icon; + } + override getLabelExtraClasses(): string[] { if (!this._terminalInstance) { return []; } - const extraClasses: string[] = ['terminal-tab']; + const extraClasses: string[] = ['terminal-tab', 'product-icon']; const colorClass = getColorClass(this._terminalInstance); if (colorClass) { extraClasses.push(colorClass); @@ -204,9 +211,6 @@ export class TerminalEditorInput extends EditorInput implements IEditorCloseHand if (uriClasses) { extraClasses.push(...uriClasses); } - if (ThemeIcon.isThemeIcon(this._terminalInstance.icon)) { - extraClasses.push(`codicon-${this._terminalInstance.icon.id}`); - } return extraClasses; }