Skip to content

Commit 9eadf51

Browse files
committed
Use dropdown.background color in debug dropdown. Fixes microsoft#95704
1 parent 4053bce commit 9eadf51

2 files changed

Lines changed: 4 additions & 13 deletions

File tree

src/vs/workbench/contrib/debug/browser/debugActionViewItems.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ import { ICommandService } from 'vs/platform/commands/common/commands';
1515
import { IDebugService, IDebugSession, IDebugConfiguration, IConfig, ILaunch } from 'vs/workbench/contrib/debug/common/debug';
1616
import { IThemeService } from 'vs/platform/theme/common/themeService';
1717
import { attachSelectBoxStyler, attachStylerCallback } from 'vs/platform/theme/common/styler';
18-
import { SIDE_BAR_BACKGROUND } from 'vs/workbench/common/theme';
19-
import { selectBorder } from 'vs/platform/theme/common/colorRegistry';
18+
import { selectBorder, selectBackground } from 'vs/platform/theme/common/colorRegistry';
2019
import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
2120
import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
2221
import { IDisposable, dispose } from 'vs/base/common/lifecycle';
@@ -51,9 +50,7 @@ export class StartDebugActionViewItem implements IActionViewItem {
5150
this.toDispose = [];
5251
this.selectBox = new SelectBox([], -1, contextViewService, undefined, { ariaLabel: nls.localize('debugLaunchConfigurations', 'Debug Launch Configurations') });
5352
this.toDispose.push(this.selectBox);
54-
this.toDispose.push(attachSelectBoxStyler(this.selectBox, themeService, {
55-
selectBackground: SIDE_BAR_BACKGROUND
56-
}));
53+
this.toDispose.push(attachSelectBoxStyler(this.selectBox, themeService));
5754

5855
this.registerListeners();
5956
}
@@ -124,9 +121,10 @@ export class StartDebugActionViewItem implements IActionViewItem {
124121
event.stopPropagation();
125122
}
126123
}));
127-
this.toDispose.push(attachStylerCallback(this.themeService, { selectBorder }, colors => {
124+
this.toDispose.push(attachStylerCallback(this.themeService, { selectBorder, selectBackground }, colors => {
128125
this.container.style.border = colors.selectBorder ? `1px solid ${colors.selectBorder}` : '';
129126
selectBoxContainer.style.borderLeft = colors.selectBorder ? `1px solid ${colors.selectBorder}` : '';
127+
this.start.style.backgroundColor = colors.selectBackground ? `${colors.selectBackground}` : '';
130128
}));
131129
this.debugService.getConfigurationManager().getDynamicProviders().then(providers => {
132130
this.providers = providers;

src/vs/workbench/contrib/debug/browser/media/debugViewlet.css

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,22 +42,15 @@
4242

4343
.monaco-workbench .part > .title > .title-actions .start-debug-action-item .codicon {
4444
line-height: inherit;
45-
outline-offset: 0px;
4645
flex-shrink: 0;
4746
transition: transform 50ms ease;
4847
}
4948

50-
.monaco-workbench .monaco-action-bar .start-debug-action-item .configuration.select-container {
51-
margin-left: 1px;
52-
}
53-
5449
.monaco-workbench .monaco-action-bar .start-debug-action-item .configuration .monaco-select-box {
5550
border: none;
5651
margin-top: 0px;
5752
cursor: pointer;
58-
font-size: inherit;
5953
line-height: inherit;
60-
outline-offset: 0px;
6154
}
6255

6356
.monaco-workbench .monaco-action-bar .start-debug-action-item .configuration.disabled .monaco-select-box {

0 commit comments

Comments
 (0)