Skip to content

Commit ac05245

Browse files
author
Najmieh Sadat
authored
Use CSS variables over registerThemingParticipant - minimap viewparts (microsoft#165465)
* Replace Theme register participant with the CSS variables
1 parent cddd30c commit ac05245

File tree

2 files changed

+15
-23
lines changed

2 files changed

+15
-23
lines changed

src/vs/editor/browser/viewParts/minimap/minimap.css

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,18 @@
1515
opacity: 1;
1616
}
1717
/* END cover the case that slider is visible on mouseover */
18-
18+
.monaco-editor .minimap-slider .minimap-slider-horizontal {
19+
color: var(--vscode-minimapSlider-background);
20+
}
21+
.monaco-editor .minimap-slider:hover .minimap-slider-horizontal {
22+
color: var(--vscode-minimapSlider-hoverBackground);
23+
}
24+
.monaco-editor .minimap-slider.active .minimap-slider-horizontal {
25+
color: var(--vscode-minimapSlider-activeBackground);
26+
}
27+
.monaco-editor .minimap-shadow-visible {
28+
box-shadow: var(--vscode-minimap-shadow) -6px 0 6px -6px inset;
29+
}
1930
.monaco-editor .minimap-shadow-hidden {
2031
position: absolute;
2132
width: 0;
@@ -33,9 +44,9 @@
3344

3445
/* 0.5s fade in/out for the minimap */
3546
.minimap.autohide {
36-
opacity: 0.0;
47+
opacity: 0;
3748
transition: opacity 0.5s;
3849
}
3950
.minimap.autohide:hover {
40-
opacity: 1.0;
51+
opacity: 1;
4152
}

src/vs/editor/browser/viewParts/minimap/minimap.ts

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ import { ViewContext } from 'vs/editor/common/viewModel/viewContext';
2727
import { EditorTheme } from 'vs/editor/common/editorTheme';
2828
import * as viewEvents from 'vs/editor/common/viewEvents';
2929
import { ViewLineData, ViewModelDecoration } from 'vs/editor/common/viewModel';
30-
import { minimapSelection, scrollbarShadow, minimapBackground, minimapSliderBackground, minimapSliderHoverBackground, minimapSliderActiveBackground, minimapForegroundOpacity } from 'vs/platform/theme/common/colorRegistry';
31-
import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
30+
import { minimapSelection, minimapBackground, minimapForegroundOpacity } from 'vs/platform/theme/common/colorRegistry';
3231
import { ModelDecorationMinimapOptions } from 'vs/editor/common/model/textModel';
3332
import { Selection } from 'vs/editor/common/core/selection';
3433
import { Color } from 'vs/base/common/color';
@@ -2000,21 +1999,3 @@ class ContiguousLineMap<T> {
20001999
}
20012000
}
20022001

2003-
registerThemingParticipant((theme, collector) => {
2004-
const sliderBackground = theme.getColor(minimapSliderBackground);
2005-
if (sliderBackground) {
2006-
collector.addRule(`.monaco-editor .minimap-slider .minimap-slider-horizontal { background: ${sliderBackground}; }`);
2007-
}
2008-
const sliderHoverBackground = theme.getColor(minimapSliderHoverBackground);
2009-
if (sliderHoverBackground) {
2010-
collector.addRule(`.monaco-editor .minimap-slider:hover .minimap-slider-horizontal { background: ${sliderHoverBackground}; }`);
2011-
}
2012-
const sliderActiveBackground = theme.getColor(minimapSliderActiveBackground);
2013-
if (sliderActiveBackground) {
2014-
collector.addRule(`.monaco-editor .minimap-slider.active .minimap-slider-horizontal { background: ${sliderActiveBackground}; }`);
2015-
}
2016-
const shadow = theme.getColor(scrollbarShadow);
2017-
if (shadow) {
2018-
collector.addRule(`.monaco-editor .minimap-shadow-visible { box-shadow: ${shadow} -6px 0 6px -6px inset; }`);
2019-
}
2020-
});

0 commit comments

Comments
 (0)