Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-27 12:04:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update Octicons to new style

Browse Source
This commit is contained in:
Miguel Solorio
2019-09-26 09:15:15 -07:00
parent 632115a4d6
commit ba3613e903
9 changed files with 23 additions and 902 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/vs/workbench/browser/layout.ts
View File

@@ -47,8 +47,6 @@ enum Settings {
ZEN_MODE_RESTORE = 'zenMode.restore',
// TODO @misolori update this when finished
OCTICONS_UPDATE_ENABLED = 'workbench.octiconsUpdate.enabled',
}
enum Storage {
@@ -186,10 +184,6 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
transitionDisposables: new DisposableStore()
},
// TODO @misolori update this when finished
octiconsUpdate: {
enabled: false
}
};
constructor(
@@ -340,10 +334,6 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
const newMenubarVisibility = this.configurationService.getValue<MenuBarVisibility>(Settings.MENUBAR_VISIBLE);
this.setMenubarVisibility(newMenubarVisibility, !!skipLayout);
// TODO @misolori update this when finished
const newOcticonsUpdate = this.configurationService.getValue<boolean>(Settings.OCTICONS_UPDATE_ENABLED);
this.setOcticonsUpdate(newOcticonsUpdate);
}
private setSideBarPosition(position: Position): void {
@@ -456,9 +446,6 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
// Zen mode enablement
this.state.zenMode.restore = this.storageService.getBoolean(Storage.ZEN_MODE_ENABLED, StorageScope.WORKSPACE, false) && this.configurationService.getValue(Settings.ZEN_MODE_RESTORE);
// TODO @misolori update this when finished
this.state.octiconsUpdate.enabled = this.configurationService.getValue<boolean>(Settings.OCTICONS_UPDATE_ENABLED);
this.setOcticonsUpdate(this.state.octiconsUpdate.enabled);
}
private resolveEditorsToOpen(fileService: IFileService): Promise<IResourceEditor[]> | IResourceEditor[] {
@@ -765,18 +752,6 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
this.workbenchGrid.setViewVisible(this.statusBarPartView, !hidden);
}
// TODO @misolori update this when finished
private setOcticonsUpdate(enabled: boolean): void {
this.state.octiconsUpdate.enabled = enabled;
// Update DOM
if (enabled) {
document.body.dataset.octiconsUpdate = 'enabled';
} else {
document.body.dataset.octiconsUpdate = '';
}
}
protected createWorkbenchLayout(instantiationService: IInstantiationService): void {
const titleBar = this.getPart(Parts.TITLEBAR_PART);
const editorPart = this.getPart(Parts.EDITOR_PART);

5
src/vs/workbench/browser/workbench.contribution.ts
View File

@@ -233,11 +233,6 @@ import { isMacintosh, isWindows, isLinux, isWeb, isNative } from 'vs/base/common
'description': nls.localize('workbench.enableExperiments', "Fetches experiments to run from a Microsoft online service."),
'default': true,
'tags': ['usesOnlineServices']
},
'workbench.octiconsUpdate.enabled': {
'type': 'boolean',
'default': true,
'description': nls.localize('workbench.octiconsUpdate.enabled', "Controls the visibility of the new Octicons style in the workbench.")
}
}
});