From 8f2d12c97e74b22147613f5f52e28ef75deaebff Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Thu, 1 Jun 2017 12:42:00 +0200 Subject: [PATCH] Activity bar: active item decoration lost when hovering (fixes #27822) --- .../browser/parts/activitybar/activitybarActions.ts | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts b/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts index 7aab7fc7c7d..ee8df3e9d27 100644 --- a/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts +++ b/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts @@ -458,9 +458,9 @@ export class ViewletActionItem extends ActivityActionItem { protected _updateChecked(): void { if (this.getAction().checked) { - this.$container.addClass('active'); + this.$container.addClass('checked'); } else { - this.$container.removeClass('active'); + this.$container.removeClass('checked'); } } @@ -723,7 +723,9 @@ registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => { } .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item.active:before, - .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item.active:hover:before { + .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item.active:hover:before, + .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item.checked:before, + .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item.checked:hover:before { outline: 1px solid; } @@ -732,6 +734,7 @@ registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => { } .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item.active:before, + .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item.checked:before, .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item:hover:before { opacity: 1; } @@ -742,6 +745,8 @@ registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => { .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item.active:before, .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item.active:hover:before, + .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item.checked:before, + .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item.checked:hover:before, .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item:hover:before { outline-color: ${outline}; } @@ -754,6 +759,7 @@ registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => { if (focusBorderColor) { collector.addRule(` .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item.active .action-label, + .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item.checked .action-label, .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item:focus .action-label, .monaco-workbench > .activitybar > .content .monaco-action-bar .action-item:hover .action-label { opacity: 1;