mirror of
https://github.com/microsoft/vscode.git
synced 2026-09-03 16:15:28 +01:00
Revert "Tweaks to the list row focus settings list"
This reverts commit 7e868f45dd.
This commit is contained in:
Rob Lourens
@@ -175,14 +175,14 @@
|
||||
|
||||
.settings-editor > .settings-body .settings-tree-container .setting-toolbar-container {
|
||||
position: absolute;
|
||||
left: -22px;
|
||||
left: -32px;
|
||||
top: 11px;
|
||||
bottom: 0px;
|
||||
width: 26px;
|
||||
}
|
||||
|
||||
.settings-editor > .settings-body .settings-tree-container .monaco-list-row .mouseover .setting-toolbar-container > .monaco-toolbar .codicon,
|
||||
.settings-editor > .settings-body .settings-tree-container .monaco-list-row.focused .setting-item-contents .setting-toolbar-container > .monaco-toolbar .codicon,
|
||||
.settings-editor > .settings-body .settings-tree-container .monaco-list-row .setting-item-contents.focused .setting-toolbar-container > .monaco-toolbar .codicon,
|
||||
.settings-editor > .settings-body .settings-tree-container .monaco-list-row .setting-toolbar-container:hover > .monaco-toolbar .codicon,
|
||||
.settings-editor > .settings-body .settings-tree-container .monaco-list-row .setting-toolbar-container > .monaco-toolbar .active .codicon {
|
||||
opacity: 1;
|
||||
@@ -283,34 +283,15 @@
|
||||
max-width: 1000px;
|
||||
margin: auto;
|
||||
box-sizing: border-box;
|
||||
padding-left: 204px;
|
||||
padding-right: 5px;
|
||||
padding-left: 219px;
|
||||
padding-right: 20px;
|
||||
overflow: visible;
|
||||
}
|
||||
|
||||
.settings-editor > .settings-body > .settings-tree-container .settings-group-title-label::before,
|
||||
.settings-editor > .settings-body > .settings-tree-container .settings-group-title-label::after,
|
||||
.settings-editor > .settings-body > .settings-tree-container .setting-item-contents::before,
|
||||
.settings-editor > .settings-body > .settings-tree-container .setting-item-contents::after {
|
||||
content: ' ';
|
||||
position: absolute;
|
||||
left: 0px;
|
||||
right: 0px;
|
||||
}
|
||||
|
||||
.settings-editor > .settings-body > .settings-tree-container .settings-group-title-label::before,
|
||||
.settings-editor > .settings-body > .settings-tree-container .setting-item-contents::before {
|
||||
top: 0px;
|
||||
}
|
||||
|
||||
.settings-editor > .settings-body > .settings-tree-container .settings-group-title-label::after,
|
||||
.settings-editor > .settings-body > .settings-tree-container .setting-item-contents::after {
|
||||
bottom: 0px;
|
||||
}
|
||||
|
||||
.settings-editor > .settings-body > .settings-tree-container .setting-item-contents {
|
||||
position: relative;
|
||||
padding: 12px 15px 18px;
|
||||
padding-top: 12px;
|
||||
padding-bottom: 18px;
|
||||
white-space: normal;
|
||||
}
|
||||
|
||||
@@ -319,7 +300,12 @@
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
display: inline-block; /* size to contents for hover to show context button */
|
||||
border-radius: 5px;
|
||||
}
|
||||
.settings-editor > .settings-body > .settings-tree-container .monaco-list-row.focused.selected .setting-item-contents .setting-item-title {
|
||||
padding-left: 7px;
|
||||
}
|
||||
|
||||
|
||||
.settings-editor > .settings-body > .settings-tree-container .setting-item-contents .setting-item-modified-indicator {
|
||||
display: none;
|
||||
@@ -332,7 +318,7 @@
|
||||
width: 6px;
|
||||
border-left-width: 2px;
|
||||
border-left-style: solid;
|
||||
left: 5px;
|
||||
left: -9px;
|
||||
top: 15px;
|
||||
bottom: 16px;
|
||||
}
|
||||
@@ -550,10 +536,13 @@
|
||||
font-weight: 600;
|
||||
height: 100%;
|
||||
box-sizing: border-box;
|
||||
border-radius: 5px;
|
||||
padding: 10px;
|
||||
padding-left: 15px;
|
||||
width: 100%;
|
||||
position: relative;
|
||||
padding-left: 0;
|
||||
}
|
||||
|
||||
.settings-editor > .settings-body > .settings-tree-container .monaco-list-row.selected .settings-group-title-label {
|
||||
padding-left: 10px;
|
||||
}
|
||||
|
||||
.settings-editor > .settings-body > .settings-tree-container .settings-group-level-1 {
|
||||
|
||||
@@ -12,7 +12,7 @@ import * as nls from 'vs/nls';
|
||||
import { Action2, MenuId, MenuRegistry, registerAction2 } from 'vs/platform/actions/common/actions';
|
||||
import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands';
|
||||
import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
|
||||
import { InputFocusedContext, IsMacNativeContext } from 'vs/platform/contextkey/common/contextkeys';
|
||||
import { IsMacNativeContext } from 'vs/platform/contextkey/common/contextkeys';
|
||||
import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
|
||||
import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
|
||||
import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
|
||||
@@ -50,8 +50,6 @@ const SETTINGS_EDITOR_COMMAND_EDIT_FOCUSED_SETTING = 'settings.action.editFocuse
|
||||
const SETTINGS_EDITOR_COMMAND_FOCUS_SETTINGS_FROM_SEARCH = 'settings.action.focusSettingsFromSearch';
|
||||
const SETTINGS_EDITOR_COMMAND_FOCUS_SETTINGS_LIST = 'settings.action.focusSettingsList';
|
||||
const SETTINGS_EDITOR_COMMAND_FOCUS_TOC = 'settings.action.focusTOC';
|
||||
const SETTINGS_EDITOR_COMMAND_FOCUS_TOC2 = 'settings.action.focusTOC2';
|
||||
const SETTINGS_EDITOR_COMMAND_FOCUS_CONTROL = 'settings.action.focusSettingControl';
|
||||
|
||||
const SETTINGS_EDITOR_COMMAND_SWITCH_TO_JSON = 'settings.switchToJSON';
|
||||
const SETTINGS_EDITOR_COMMAND_FILTER_MODIFIED = 'settings.filterByModified';
|
||||
@@ -713,76 +711,20 @@ class PreferencesActionsContribution extends Disposable implements IWorkbenchCon
|
||||
constructor() {
|
||||
super({
|
||||
id: SETTINGS_EDITOR_COMMAND_FOCUS_TOC,
|
||||
keybinding: [
|
||||
{
|
||||
primary: KeyCode.Escape,
|
||||
weight: KeybindingWeight.WorkbenchContrib,
|
||||
when: ContextKeyExpr.and(CONTEXT_SETTINGS_EDITOR, CONTEXT_TOC_ROW_FOCUS.negate()),
|
||||
},
|
||||
{
|
||||
primary: KeyCode.LeftArrow,
|
||||
weight: KeybindingWeight.WorkbenchContrib,
|
||||
when: ContextKeyExpr.and(CONTEXT_SETTINGS_EDITOR, CONTEXT_TOC_ROW_FOCUS.negate(), InputFocusedContext.negate())
|
||||
}],
|
||||
title: nls.localize('settings.focusSettingsTOC', "Focus settings TOC tree")
|
||||
});
|
||||
}
|
||||
|
||||
run(accessor: ServicesAccessor): void {
|
||||
const preferencesEditor = getPreferencesEditor(accessor);
|
||||
if (!(preferencesEditor instanceof SettingsEditor2)) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (document.activeElement?.classList.contains('monaco-list')) {
|
||||
preferencesEditor.focusTOC();
|
||||
} else {
|
||||
preferencesEditor.focusSettings();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
registerAction2(class extends Action2 {
|
||||
constructor() {
|
||||
super({
|
||||
id: SETTINGS_EDITOR_COMMAND_FOCUS_CONTROL,
|
||||
precondition: ContextKeyExpr.and(CONTEXT_SETTINGS_EDITOR, CONTEXT_TOC_ROW_FOCUS.negate()),
|
||||
keybinding: {
|
||||
primary: KeyCode.Enter,
|
||||
primary: KeyCode.Escape,
|
||||
weight: KeybindingWeight.WorkbenchContrib,
|
||||
},
|
||||
title: nls.localize('settings.focusSettingControl', "Focus setting control")
|
||||
});
|
||||
}
|
||||
|
||||
run(accessor: ServicesAccessor): void {
|
||||
const preferencesEditor = getPreferencesEditor(accessor);
|
||||
if (!(preferencesEditor instanceof SettingsEditor2)) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (document.activeElement?.classList.contains('monaco-list')) {
|
||||
preferencesEditor.focusSettings(true);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
registerAction2(class extends Action2 {
|
||||
constructor() {
|
||||
super({
|
||||
id: SETTINGS_EDITOR_COMMAND_FOCUS_TOC2,
|
||||
|
||||
title: nls.localize('settings.focusSettingsTOC', "Focus settings TOC tree")
|
||||
});
|
||||
}
|
||||
|
||||
run(accessor: ServicesAccessor): void {
|
||||
const preferencesEditor = getPreferencesEditor(accessor);
|
||||
if (!(preferencesEditor instanceof SettingsEditor2)) {
|
||||
return;
|
||||
if (preferencesEditor instanceof SettingsEditor2) {
|
||||
preferencesEditor.focusTOC();
|
||||
}
|
||||
|
||||
preferencesEditor.focusTOC();
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
@@ -348,8 +348,7 @@ export class SettingsEditor2 extends EditorPane {
|
||||
}
|
||||
}
|
||||
|
||||
focusSettings(focusSettingInput = false): void {
|
||||
// TODO@roblourens is this in the right place?
|
||||
focusSettings(): void {
|
||||
// Update ARIA global labels
|
||||
const labelElement = this.settingsAriaExtraLabelsContainer.querySelector('#settings_aria_more_actions_shortcut_label');
|
||||
if (labelElement) {
|
||||
@@ -359,18 +358,9 @@ export class SettingsEditor2 extends EditorPane {
|
||||
}
|
||||
}
|
||||
|
||||
const focused = this.settingsTree.getFocus();
|
||||
if (!focused.length) {
|
||||
this.settingsTree.focusFirst();
|
||||
}
|
||||
|
||||
this.settingsTree.domFocus();
|
||||
|
||||
if (focusSettingInput) {
|
||||
const controlInFocusedRow = this.settingsTree.getHTMLElement().querySelector(`.focused ${AbstractSettingRenderer.CONTROL_SELECTOR}`);
|
||||
if (controlInFocusedRow) {
|
||||
(<HTMLElement>controlInFocusedRow).focus();
|
||||
}
|
||||
const firstFocusable = this.settingsTree.getHTMLElement().querySelector(AbstractSettingRenderer.CONTROL_SELECTOR);
|
||||
if (firstFocusable) {
|
||||
(<HTMLElement>firstFocusable).focus();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -36,13 +36,13 @@ import { IContextMenuService, IContextViewService } from 'vs/platform/contextvie
|
||||
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
|
||||
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
|
||||
import { IOpenerService } from 'vs/platform/opener/common/opener';
|
||||
import { editorBackground, errorForeground, focusBorder, foreground, inputValidationErrorBackground, inputValidationErrorBorder, inputValidationErrorForeground } from 'vs/platform/theme/common/colorRegistry';
|
||||
import { editorBackground, errorForeground, focusBorder, foreground, inputValidationErrorBackground, inputValidationErrorBorder, inputValidationErrorForeground, listActiveSelectionBackground, listActiveSelectionForeground } from 'vs/platform/theme/common/colorRegistry';
|
||||
import { attachButtonStyler, attachInputBoxStyler, attachSelectBoxStyler, attachStyler } from 'vs/platform/theme/common/styler';
|
||||
import { ICssStyleCollector, IColorTheme, IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
|
||||
import { getIgnoredSettings } from 'vs/platform/userDataSync/common/settingsMerge';
|
||||
import { ITOCEntry } from 'vs/workbench/contrib/preferences/browser/settingsLayout';
|
||||
import { ISettingsEditorViewState, settingKeyToDisplayFormat, SettingsTreeElement, SettingsTreeGroupChild, SettingsTreeGroupElement, SettingsTreeNewExtensionsElement, SettingsTreeSettingElement } from 'vs/workbench/contrib/preferences/browser/settingsTreeModels';
|
||||
import { ExcludeSettingWidget, ISettingListChangeEvent, IListDataItem, ListSettingWidget, settingsNumberInputBackground, settingsNumberInputBorder, settingsNumberInputForeground, settingsSelectBackground, settingsSelectBorder, settingsSelectForeground, settingsSelectListBorder, settingsTextInputBackground, settingsTextInputBorder, settingsTextInputForeground, ObjectSettingWidget, IObjectDataItem, IObjectEnumOption, ObjectValue, IObjectValueSuggester, IObjectKeySuggester, focusedRowBackground, focusedRowBorder, settingsHeaderForeground, rowHoverBackground } from 'vs/workbench/contrib/preferences/browser/settingsWidgets';
|
||||
import { ExcludeSettingWidget, ISettingListChangeEvent, IListDataItem, ListSettingWidget, settingsHeaderForeground, settingsNumberInputBackground, settingsNumberInputBorder, settingsNumberInputForeground, settingsSelectBackground, settingsSelectBorder, settingsSelectForeground, settingsSelectListBorder, settingsTextInputBackground, settingsTextInputBorder, settingsTextInputForeground, ObjectSettingWidget, IObjectDataItem, IObjectEnumOption, ObjectValue, IObjectValueSuggester, IObjectKeySuggester } from 'vs/workbench/contrib/preferences/browser/settingsWidgets';
|
||||
import { SETTINGS_EDITOR_COMMAND_SHOW_CONTEXT_MENU } from 'vs/workbench/contrib/preferences/common/preferences';
|
||||
import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
|
||||
import { ISetting, ISettingsGroup, SettingValueType } from 'vs/workbench/services/preferences/common/preferences';
|
||||
@@ -650,7 +650,7 @@ export abstract class AbstractSettingRenderer extends Disposable implements ITre
|
||||
private fixToolbarIcon(toolbar: ToolBar): void {
|
||||
const button = toolbar.getElement().querySelector('.codicon-toolbar-more');
|
||||
if (button) {
|
||||
(<HTMLElement>button).tabIndex = 0;
|
||||
(<HTMLElement>button).tabIndex = -1;
|
||||
|
||||
// change icon from ellipsis to gear
|
||||
(<HTMLElement>button).classList.add('codicon-gear');
|
||||
@@ -1981,26 +1981,6 @@ export class SettingsTree extends WorkbenchObjectTree<SettingsTreeElement> {
|
||||
collector.addRule(`.settings-editor > .settings-body > .settings-tree-container .setting-item.invalid-input .setting-item-control .monaco-inputbox.idle { outline-width: 0; border-style:solid; border-width: 1px; border-color: ${invalidInputBorder}; }`);
|
||||
}
|
||||
|
||||
const focusedRowBackgroundColor = theme.getColor(focusedRowBackground);
|
||||
if (focusedRowBackgroundColor) {
|
||||
collector.addRule(`.settings-editor > .settings-body > .settings-tree-container .monaco-list-row.focused .setting-item-contents,
|
||||
.settings-editor > .settings-body > .settings-tree-container .monaco-list-row.focused .settings-group-title-label { background-color: ${focusedRowBackgroundColor}; }`);
|
||||
}
|
||||
|
||||
const rowHoverBackgroundColor = theme.getColor(rowHoverBackground);
|
||||
if (rowHoverBackgroundColor) {
|
||||
collector.addRule(`.settings-editor > .settings-body > .settings-tree-container .monaco-list-row .setting-item-contents:hover,
|
||||
.settings-editor > .settings-body > .settings-tree-container .monaco-list-row .settings-group-title-label:hover { background-color: ${rowHoverBackgroundColor}; }`);
|
||||
}
|
||||
|
||||
const focusedRowBorderColor = theme.getColor(focusedRowBorder);
|
||||
if (focusedRowBorderColor) {
|
||||
collector.addRule(`.settings-editor > .settings-body > .settings-tree-container .monaco-list:focus-within .monaco-list-row.focused .setting-item-contents::before,
|
||||
.settings-editor > .settings-body > .settings-tree-container .monaco-list:focus-within .monaco-list-row.focused .setting-item-contents::after { border-top: 1px solid ${focusedRowBorderColor} }`);
|
||||
collector.addRule(`.settings-editor > .settings-body > .settings-tree-container .monaco-list:focus-within .monaco-list-row.focused .settings-group-title-label::before,
|
||||
.settings-editor > .settings-body > .settings-tree-container .monaco-list:focus-within .monaco-list-row.focused .settings-group-title-label::after { border-top: 1px solid ${focusedRowBorderColor} }`);
|
||||
}
|
||||
|
||||
const headerForegroundColor = theme.getColor(settingsHeaderForeground);
|
||||
if (headerForegroundColor) {
|
||||
collector.addRule(`.settings-editor > .settings-body > .settings-tree-container .settings-group-title-label { color: ${headerForegroundColor}; }`);
|
||||
@@ -2012,11 +1992,18 @@ export class SettingsTree extends WorkbenchObjectTree<SettingsTreeElement> {
|
||||
collector.addRule(`.settings-editor > .settings-body > .settings-tree-container .setting-item-contents .setting-item-markdown a:focus { outline-color: ${focusBorderColor} }`);
|
||||
}
|
||||
|
||||
// const listActiveSelectionBackgroundColor = theme.getColor(listActiveSelectionBackground);
|
||||
// if (listActiveSelectionBackgroundColor) {
|
||||
// collector.addRule(`.settings-editor > .settings-body > .settings-tree-container .monaco-list-row.selected .setting-item-contents .setting-item-title { background-color: ${listActiveSelectionBackgroundColor}; }`);
|
||||
// collector.addRule(`.settings-editor > .settings-body > .settings-tree-container .monaco-list-row.selected .settings-group-title-label { background-color: ${listActiveSelectionBackgroundColor}; }`);
|
||||
// }
|
||||
const listActiveSelectionBackgroundColor = theme.getColor(listActiveSelectionBackground);
|
||||
if (listActiveSelectionBackgroundColor) {
|
||||
collector.addRule(`.settings-editor > .settings-body > .settings-tree-container .monaco-list-row.selected .setting-item-contents .setting-item-title { background-color: ${listActiveSelectionBackgroundColor}; }`);
|
||||
collector.addRule(`.settings-editor > .settings-body > .settings-tree-container .monaco-list-row.selected .settings-group-title-label { background-color: ${listActiveSelectionBackgroundColor}; }`);
|
||||
}
|
||||
|
||||
const listActiveSelectionForegroundColor = theme.getColor(listActiveSelectionForeground);
|
||||
if (listActiveSelectionForegroundColor) {
|
||||
collector.addRule(`.settings-editor > .settings-body > .settings-tree-container .monaco-list-row.selected .setting-item-contents .setting-item-title { color: ${listActiveSelectionForegroundColor}; }`);
|
||||
collector.addRule(`.settings-editor > .settings-body > .settings-tree-container .monaco-list-row.selected .setting-item-label { color: ${listActiveSelectionForegroundColor}; }`);
|
||||
collector.addRule(`.settings-editor > .settings-body > .settings-tree-container .monaco-list-row.selected .settings-group-title-label { color: ${listActiveSelectionForegroundColor}; }`);
|
||||
}
|
||||
}));
|
||||
|
||||
this.getHTMLElement().classList.add('settings-editor-tree');
|
||||
|
||||
@@ -16,7 +16,7 @@ import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
|
||||
import 'vs/css!./media/settingsWidgets';
|
||||
import { localize } from 'vs/nls';
|
||||
import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
|
||||
import { foreground, inputBorder, inputForeground, listActiveSelectionBackground, listActiveSelectionForeground, listHoverBackground, listHoverForeground, listInactiveSelectionBackground, listInactiveSelectionForeground, registerColor, selectBackground, selectBorder, selectForeground, textLinkForeground, textPreformatForeground, editorWidgetBorder, textLinkActiveForeground, simpleCheckboxBackground, simpleCheckboxForeground, simpleCheckboxBorder, listFocusBackground, transparent, focusBorder } from 'vs/platform/theme/common/colorRegistry';
|
||||
import { foreground, inputBackground, inputBorder, inputForeground, listActiveSelectionBackground, listActiveSelectionForeground, listHoverBackground, listHoverForeground, listInactiveSelectionBackground, listInactiveSelectionForeground, registerColor, selectBackground, selectBorder, selectForeground, textLinkForeground, textPreformatForeground, editorWidgetBorder, textLinkActiveForeground, simpleCheckboxBackground, simpleCheckboxForeground, simpleCheckboxBorder } from 'vs/platform/theme/common/colorRegistry';
|
||||
import { attachButtonStyler, attachInputBoxStyler, attachSelectBoxStyler } from 'vs/platform/theme/common/styler';
|
||||
import { ICssStyleCollector, IColorTheme, IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
|
||||
import { disposableTimeout } from 'vs/base/common/async';
|
||||
@@ -25,7 +25,6 @@ import { preferencesEditIcon } from 'vs/workbench/contrib/preferences/browser/pr
|
||||
import { SelectBox } from 'vs/base/browser/ui/selectBox/selectBox';
|
||||
import { isIOS } from 'vs/base/common/platform';
|
||||
import { BrowserFeatures } from 'vs/base/browser/canIUse';
|
||||
import { PANEL_BORDER } from 'vs/workbench/common/theme';
|
||||
|
||||
const $ = DOM.$;
|
||||
export const settingsHeaderForeground = registerColor('settings.headerForeground', { light: '#444444', dark: '#e7e7e7', hc: '#ffffff' }, localize('headerForeground', "The foreground color for a section header or active title."));
|
||||
@@ -47,33 +46,15 @@ export const settingsCheckboxForeground = registerColor('settings.checkboxForegr
|
||||
export const settingsCheckboxBorder = registerColor('settings.checkboxBorder', { dark: simpleCheckboxBorder, light: simpleCheckboxBorder, hc: simpleCheckboxBorder }, localize('settingsCheckboxBorder', "Settings editor checkbox border."));
|
||||
|
||||
// Text control colors
|
||||
export const settingsTextInputBackground = settingsSelectBackground; //registerColor('settings.textInputBackground', { dark: inputBackground, light: inputBackground, hc: inputBackground }, localize('textInputBoxBackground', "Settings editor text input box background."));
|
||||
export const settingsTextInputBackground = registerColor('settings.textInputBackground', { dark: inputBackground, light: inputBackground, hc: inputBackground }, localize('textInputBoxBackground', "Settings editor text input box background."));
|
||||
export const settingsTextInputForeground = registerColor('settings.textInputForeground', { dark: inputForeground, light: inputForeground, hc: inputForeground }, localize('textInputBoxForeground', "Settings editor text input box foreground."));
|
||||
export const settingsTextInputBorder = registerColor('settings.textInputBorder', { dark: inputBorder, light: inputBorder, hc: inputBorder }, localize('textInputBoxBorder', "Settings editor text input box border."));
|
||||
|
||||
// Number control colors
|
||||
export const settingsNumberInputBackground = settingsSelectBackground; // registerColor('settings.numberInputBackground', { dark: inputBackground, light: inputBackground, hc: inputBackground }, localize('numberInputBoxBackground', "Settings editor number input box background."));
|
||||
export const settingsNumberInputBackground = registerColor('settings.numberInputBackground', { dark: inputBackground, light: inputBackground, hc: inputBackground }, localize('numberInputBoxBackground', "Settings editor number input box background."));
|
||||
export const settingsNumberInputForeground = registerColor('settings.numberInputForeground', { dark: inputForeground, light: inputForeground, hc: inputForeground }, localize('numberInputBoxForeground', "Settings editor number input box foreground."));
|
||||
export const settingsNumberInputBorder = registerColor('settings.numberInputBorder', { dark: inputBorder, light: inputBorder, hc: inputBorder }, localize('numberInputBoxBorder', "Settings editor number input box border."));
|
||||
|
||||
export const focusedRowBackground = registerColor('settings.focusedRowBackground', {
|
||||
dark: transparent(PANEL_BORDER, .4),
|
||||
light: transparent(listFocusBackground, .4),
|
||||
hc: null
|
||||
}, localize('focusedRowBackground', "The background color of a cell when the row is focused."));
|
||||
|
||||
export const rowHoverBackground = registerColor('notebook.rowHoverBackground', {
|
||||
dark: transparent(focusedRowBackground, .5),
|
||||
light: transparent(focusedRowBackground, .7),
|
||||
hc: null
|
||||
}, localize('notebook.rowHoverBackground', "The background color of a row when the row is hovered."));
|
||||
|
||||
export const focusedRowBorder = registerColor('notebook.focusedRowBorder', {
|
||||
dark: Color.white.transparent(0.12),
|
||||
light: Color.black.transparent(0.12),
|
||||
hc: focusBorder
|
||||
}, localize('notebook.focusedRowBorder', "The color of the row's top and bottom border when the row is focused."));
|
||||
|
||||
registerThemingParticipant((theme: IColorTheme, collector: ICssStyleCollector) => {
|
||||
const checkboxBackgroundColor = theme.getColor(settingsCheckboxBackground);
|
||||
if (checkboxBackgroundColor) {
|
||||
@@ -546,7 +527,7 @@ export class ListSettingWidget extends AbstractListSettingWidget<IListDataItem>
|
||||
|
||||
valueInput.element.classList.add('setting-list-valueInput');
|
||||
this.listDisposables.add(attachInputBoxStyler(valueInput, this.themeService, {
|
||||
inputBackground: settingsSelectBackground,
|
||||
inputBackground: settingsTextInputBackground,
|
||||
inputForeground: settingsTextInputForeground,
|
||||
inputBorder: settingsTextInputBorder
|
||||
}));
|
||||
@@ -565,7 +546,7 @@ export class ListSettingWidget extends AbstractListSettingWidget<IListDataItem>
|
||||
siblingInput.element.classList.add('setting-list-siblingInput');
|
||||
this.listDisposables.add(siblingInput);
|
||||
this.listDisposables.add(attachInputBoxStyler(siblingInput, this.themeService, {
|
||||
inputBackground: settingsSelectBackground,
|
||||
inputBackground: settingsTextInputBackground,
|
||||
inputForeground: settingsTextInputForeground,
|
||||
inputBorder: settingsTextInputBorder
|
||||
}));
|
||||
@@ -927,7 +908,7 @@ export class ObjectSettingWidget extends AbstractListSettingWidget<IObjectDataIt
|
||||
inputBox.element.classList.add('setting-list-object-input');
|
||||
|
||||
this.listDisposables.add(attachInputBoxStyler(inputBox, this.themeService, {
|
||||
inputBackground: settingsSelectBackground,
|
||||
inputBackground: settingsTextInputBackground,
|
||||
inputForeground: settingsTextInputForeground,
|
||||
inputBorder: settingsTextInputBorder
|
||||
}));
|
||||
|
||||
Reference in New Issue
Block a user