Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-07-25 15:35:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

#102581 update icon and merge view into title

Browse Source
This commit is contained in:
Sandeep Somavarapu
2020-07-21 08:38:34 +02:00
parent 6c79b090ee
commit 5451dbfb9e
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/contrib/userDataSync/browser/userDataManualSyncView.ts
+1 -1
View File
@@ -201,7 +201,7 @@ export class UserDataManualSyncViewPane extends TreeViewPane {
super({
id: `workbench.actions.sync.merge`,
title: localize('workbench.actions.sync.merge', "Merge"),
icon: Codicon.gitMerge,
icon: Codicon.merge,
menu: {
id: MenuId.ViewItemContext,
when: ContextKeyExpr.and(ContextKeyEqualsExpr.create('view', MANUAL_SYNC_VIEW_ID), ContextKeyExpr.equals('viewItem', 'sync-resource-preview')),
src/vs/workbench/contrib/userDataSync/browser/userDataSyncViews.ts
+1 -1
View File
@@ -55,7 +55,7 @@ export class UserDataSyncViewPaneContainer extends ViewPaneContainer {
@IExtensionService extensionService: IExtensionService,
@IViewDescriptorService viewDescriptorService: IViewDescriptorService,
) {
super(containerId, { mergeViewWithContainerWhenSingleView: false }, instantiationService, configurationService, layoutService, contextMenuService, telemetryService, extensionService, themeService, storageService, contextService, viewDescriptorService);
super(containerId, { mergeViewWithContainerWhenSingleView: true }, instantiationService, configurationService, layoutService, contextMenuService, telemetryService, extensionService, themeService, storageService, contextService, viewDescriptorService);
}
getActions(): IAction[] {