development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-09-29 16:01:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update default color for sticky scroll and location specific ones (#218712)

Browse source 
default color for sticky scroll and location specific ones
This commit is contained in:
Benjamin Christopher Simmonds 2024-06-28 15:47:48 +02:00 committed by GitHub
parent f272e4d094
commit efa1397e63
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/vs/platform/theme/browser/defaultStyles.ts
View file

@ -176,7 +176,7 @@ export const defaultListStyles: IListStyles = {
treeInactiveIndentGuidesStroke: asCssVariable(treeInactiveIndentGuidesStroke),
treeStickyScrollBackground: undefined,
treeStickyScrollBorder: undefined,
treeStickyScrollShadow: undefined,
treeStickyScrollShadow: asCssVariable(scrollbarShadow),
tableColumnsBorder: asCssVariable(tableColumnsBorder),
tableOddRowsBackgroundColor: asCssVariable(tableOddRowsBackgroundColor),
};

5
src/vs/workbench/contrib/extensions/browser/extensionsViews.ts
View file

@ -41,7 +41,6 @@ import { CancelablePromise, createCancelablePromise, ThrottledDelayer } from 'vs
import { IProductService } from 'vs/platform/product/common/productService';
import { SeverityIcon } from 'vs/platform/severityIcon/browser/severityIcon';
import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
import { SIDE_BAR_BACKGROUND } from 'vs/workbench/common/theme';
import { IViewDescriptorService, ViewContainerLocation } from 'vs/workbench/common/views';
import { IOpenerService } from 'vs/platform/opener/common/opener';
import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
@ -214,9 +213,7 @@ export class ExtensionsListView extends ViewPane {
return localize('extensions', "Extensions");
}
},
overrideStyles: {
listBackground: SIDE_BAR_BACKGROUND
},
overrideStyles: this.getLocationBasedColors().listOverrideStyles,
openOnSingleClick: true
}) as WorkbenchPagedList<IExtension>;
this._register(this.list.onContextMenu(e => this.onContextMenu(e), this));

5
src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.ts
View file

@ -18,7 +18,6 @@ import { IThemeService } from 'vs/platform/theme/common/themeService';
import { WorkbenchList } from 'vs/platform/list/browser/listService';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { IViewDescriptorService } from 'vs/workbench/common/views';
import { SIDE_BAR_BACKGROUND } from 'vs/workbench/common/theme';
import { IOpenerService } from 'vs/platform/opener/common/opener';
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
import { RepositoryActionRunner, RepositoryRenderer } from 'vs/workbench/contrib/scm/browser/scmRepositoryRenderer';
@ -82,9 +81,7 @@ export class SCMRepositoriesViewPane extends ViewPane {
this.list = this.instantiationService.createInstance(WorkbenchList, `SCM Main`, listContainer, delegate, [renderer], {
identityProvider,
horizontalScrolling: false,
overrideStyles: {
listBackground: SIDE_BAR_BACKGROUND
},
overrideStyles: this.getLocationBasedColors().listOverrideStyles,
accessibilityProvider: {
getAriaLabel(r: ISCMRepository) {
return r.provider.label;

7
src/vs/workbench/contrib/scm/browser/scmViewPane.ts
View file

@ -37,11 +37,10 @@ import { URI } from 'vs/base/common/uri';
import { FileKind } from 'vs/platform/files/common/files';
import { compareFileNames, comparePaths } from 'vs/base/common/comparers';
import { FuzzyScore, createMatches, IMatch } from 'vs/base/common/filters';
import { IViewDescriptorService, ViewContainerLocation } from 'vs/workbench/common/views';
import { IViewDescriptorService } from 'vs/workbench/common/views';
import { localize } from 'vs/nls';
import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
import { EditorResourceAccessor, SideBySideEditor } from 'vs/workbench/common/editor';
import { SIDE_BAR_BACKGROUND, PANEL_BACKGROUND } from 'vs/workbench/common/theme';
import { CodeEditorWidget, ICodeEditorWidgetOptions } from 'vs/editor/browser/widget/codeEditor/codeEditorWidget';
import { IEditorConstructionOptions } from 'vs/editor/browser/config/editorConfiguration';
import { getSimpleEditorOptions } from 'vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
@ -3089,9 +3088,7 @@ export class SCMViewPane extends ViewPane {
identityProvider: new SCMResourceIdentityProvider(),
sorter: new SCMTreeSorter(() => this.viewMode, () => this.viewSortKey),
keyboardNavigationLabelProvider: this.instantiationService.createInstance(SCMTreeKeyboardNavigationLabelProvider, () => this.viewMode),
overrideStyles: {
listBackground: this.viewDescriptorService.getViewLocationById(this.id) === ViewContainerLocation.Panel ? PANEL_BACKGROUND : SIDE_BAR_BACKGROUND
},
overrideStyles: this.getLocationBasedColors().listOverrideStyles,
collapseByDefault: (e: unknown) => {
// Repository, Resource Group, Resource Folder (Tree), History Item Change Folder (Tree)
if (isSCMRepository(e) || isSCMResourceGroup(e) || isSCMResourceNode(e) || isSCMHistoryItemChangeNode(e)) {