Skip to content

Commit 9d405dc

Browse files
committed
1 parent 8d25e4b commit 9d405dc

1 file changed

Lines changed: 17 additions & 4 deletions

File tree

src/vs/workbench/contrib/preferences/browser/keybindingsEditor.ts

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import { IThemeService, registerThemingParticipant, ITheme, ICssStyleCollector }
3535
import { IContextKeyService, IContextKey, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
3636
import { StandardKeyboardEvent, IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
3737
import { KeyCode, ResolvedKeybinding } from 'vs/base/common/keyCodes';
38-
import { listHighlightForeground, badgeBackground, contrastBorder, badgeForeground, listActiveSelectionForeground } from 'vs/platform/theme/common/colorRegistry';
38+
import { listHighlightForeground, badgeBackground, contrastBorder, badgeForeground, listActiveSelectionForeground, listInactiveSelectionForeground, listHoverForeground, listFocusForeground } from 'vs/platform/theme/common/colorRegistry';
3939
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
4040
import { EditorExtensionsRegistry } from 'vs/editor/browser/editorExtensions';
4141
import { WorkbenchList } from 'vs/platform/list/browser/listService';
@@ -1122,8 +1122,21 @@ registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
11221122
if (listHighlightForegroundColor) {
11231123
collector.addRule(`.keybindings-editor > .keybindings-body > .keybindings-list-container .monaco-list-row > .column .highlight { color: ${listHighlightForegroundColor}; }`);
11241124
}
1125-
const listFocusAndSelectionForegroundColor = theme.getColor(listActiveSelectionForeground);
1126-
if (listFocusAndSelectionForegroundColor) {
1127-
collector.addRule(`.keybindings-editor > .keybindings-body > .keybindings-list-container .monaco-list:focus .monaco-list-row.selected.focused > .column .monaco-keybinding-key { color: ${listFocusAndSelectionForegroundColor}; }`);
1125+
const listActiveSelectionForegroundColor = theme.getColor(listActiveSelectionForeground);
1126+
if (listActiveSelectionForegroundColor) {
1127+
collector.addRule(`.keybindings-editor > .keybindings-body > .keybindings-list-container .monaco-list:focus .monaco-list-row.selected.focused > .column .monaco-keybinding-key { color: ${listActiveSelectionForegroundColor}; }`);
1128+
collector.addRule(`.keybindings-editor > .keybindings-body > .keybindings-list-container .monaco-list:focus .monaco-list-row.selected > .column .monaco-keybinding-key { color: ${listActiveSelectionForegroundColor}; }`);
1129+
}
1130+
const listInactiveFocusAndSelectionForegroundColor = theme.getColor(listInactiveSelectionForeground);
1131+
if (listActiveSelectionForegroundColor) {
1132+
collector.addRule(`.keybindings-editor > .keybindings-body > .keybindings-list-container .monaco-list .monaco-list-row.selected > .column .monaco-keybinding-key { color: ${listInactiveFocusAndSelectionForegroundColor}; }`);
1133+
}
1134+
const listHoverForegroundColor = theme.getColor(listHoverForeground);
1135+
if (listHoverForegroundColor) {
1136+
collector.addRule(`.keybindings-editor > .keybindings-body > .keybindings-list-container .monaco-list .monaco-list-row:hover:not(.selected):not(.focused) > .column .monaco-keybinding-key { color: ${listHoverForegroundColor}; }`);
1137+
}
1138+
const listFocusForegroundColor = theme.getColor(listFocusForeground);
1139+
if (listFocusForegroundColor) {
1140+
collector.addRule(`.keybindings-editor > .keybindings-body > .keybindings-list-container .monaco-list .monaco-list-row.focused > .column .monaco-keybinding-key { color: ${listFocusForegroundColor}; }`);
11281141
}
11291142
});

0 commit comments

Comments
 (0)