Skip to content

Commit 3bd1ecd

Browse files
GauravB159gcb4
andauthored
Use css variables for editor scrollbar (microsoft#165464)
Co-authored-by: gcb4 <[email protected]>
1 parent 6621cfa commit 3bd1ecd

File tree

2 files changed

+16
-51
lines changed

2 files changed

+16
-51
lines changed

src/vs/base/browser/ui/scrollbar/media/scrollbars.css

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,33 @@
3636
left: 3px;
3737
height: 3px;
3838
width: 100%;
39+
box-shadow: var(--vscode-scrollbar-shadow) 0 6px 6px -6px inset;
3940
}
4041
.monaco-scrollable-element > .shadow.left {
4142
display: block;
4243
top: 3px;
4344
left: 0;
4445
height: 100%;
4546
width: 3px;
47+
box-shadow: var(--vscode-scrollbar-shadow) 6px 0 6px -6px inset;
4648
}
4749
.monaco-scrollable-element > .shadow.top-left-corner {
4850
display: block;
4951
top: 0;
5052
left: 0;
5153
height: 3px;
5254
width: 3px;
55+
box-shadow: var(--vscode-scrollbar-shadow) 6px 0 6px -6px inset;
56+
}
57+
58+
.monaco-scrollable-element > .scrollbar > .slider {
59+
background: var(--vscode-scrollbarSlider-background);
60+
}
61+
62+
.monaco-scrollable-element > .scrollbar > .slider:hover {
63+
background: var(--vscode-scrollbarSlider-hoverBackground);
64+
}
65+
66+
.monaco-scrollable-element > .scrollbar > .slider.active {
67+
background: var(--vscode-scrollbarSlider-activeBackground);
5368
}

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

Lines changed: 1 addition & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,8 @@ import { INewScrollPosition, ScrollType } from 'vs/editor/common/editorCommon';
1212
import { RenderingContext, RestrictedRenderingContext } from 'vs/editor/browser/view/renderingContext';
1313
import { ViewContext } from 'vs/editor/common/viewModel/viewContext';
1414
import * as viewEvents from 'vs/editor/common/viewEvents';
15-
import { registerThemingParticipant, getThemeTypeSelector } from 'vs/platform/theme/common/themeService';
15+
import { getThemeTypeSelector } from 'vs/platform/theme/common/themeService';
1616
import { EditorOption } from 'vs/editor/common/config/editorOptions';
17-
import { scrollbarShadow, scrollbarSliderActiveBackground, scrollbarSliderBackground, scrollbarSliderHoverBackground } from 'vs/platform/theme/common/colorRegistry';
18-
1917
export class EditorScrollbar extends ViewPart {
2018

2119
private readonly scrollbar: SmoothScrollableElement;
@@ -180,51 +178,3 @@ export class EditorScrollbar extends ViewPart {
180178
this.scrollbar.renderNow();
181179
}
182180
}
183-
184-
registerThemingParticipant((theme, collector) => {
185-
186-
// Scrollbars
187-
const scrollbarShadowColor = theme.getColor(scrollbarShadow);
188-
if (scrollbarShadowColor) {
189-
collector.addRule(`
190-
.monaco-scrollable-element > .shadow.top {
191-
box-shadow: ${scrollbarShadowColor} 0 6px 6px -6px inset;
192-
}
193-
194-
.monaco-scrollable-element > .shadow.left {
195-
box-shadow: ${scrollbarShadowColor} 6px 0 6px -6px inset;
196-
}
197-
198-
.monaco-scrollable-element > .shadow.top.left {
199-
box-shadow: ${scrollbarShadowColor} 6px 6px 6px -6px inset;
200-
}
201-
`);
202-
}
203-
204-
const scrollbarSliderBackgroundColor = theme.getColor(scrollbarSliderBackground);
205-
if (scrollbarSliderBackgroundColor) {
206-
collector.addRule(`
207-
.monaco-scrollable-element > .scrollbar > .slider {
208-
background: ${scrollbarSliderBackgroundColor};
209-
}
210-
`);
211-
}
212-
213-
const scrollbarSliderHoverBackgroundColor = theme.getColor(scrollbarSliderHoverBackground);
214-
if (scrollbarSliderHoverBackgroundColor) {
215-
collector.addRule(`
216-
.monaco-scrollable-element > .scrollbar > .slider:hover {
217-
background: ${scrollbarSliderHoverBackgroundColor};
218-
}
219-
`);
220-
}
221-
222-
const scrollbarSliderActiveBackgroundColor = theme.getColor(scrollbarSliderActiveBackground);
223-
if (scrollbarSliderActiveBackgroundColor) {
224-
collector.addRule(`
225-
.monaco-scrollable-element > .scrollbar > .slider.active {
226-
background: ${scrollbarSliderActiveBackgroundColor};
227-
}
228-
`);
229-
}
230-
});

0 commit comments

Comments
 (0)