From d96c1fb484b0f246479dc07eb057502920b75b5b Mon Sep 17 00:00:00 2001 From: isidor Date: Wed, 11 May 2016 15:42:50 +0200 Subject: [PATCH] open editors: change configuration name --- .../files/browser/views/openEditorsView.ts | 7 +++-- .../files/browser/views/workingFilesView.ts | 26 +++++++++---------- src/vs/workbench/parts/files/common/files.ts | 2 +- 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/src/vs/workbench/parts/files/browser/views/openEditorsView.ts b/src/vs/workbench/parts/files/browser/views/openEditorsView.ts index 8dad7504d82..5adaedae190 100644 --- a/src/vs/workbench/parts/files/browser/views/openEditorsView.ts +++ b/src/vs/workbench/parts/files/browser/views/openEditorsView.ts @@ -38,6 +38,7 @@ export class OpenEditorsView extends AdaptiveCollapsibleViewletView { private model: IEditorStacksModel; private dirtyCountElement: HTMLElement; private lastDirtyCount: number; + // Use a scheduler to update the tree as many update events come at some time so to prevent over-reacting. private updateTreeScheduler: RunOnceScheduler; constructor(actionRunner: IActionRunner, settings: any, @@ -159,16 +160,14 @@ export class OpenEditorsView extends AdaptiveCollapsibleViewletView { // } private onConfigurationUpdated(configuration: IFilesConfiguration): void { - // TODO@isidor change configuration name - let visibleOpenEditors = configuration && configuration.explorer && configuration.explorer.workingFiles && configuration.explorer.workingFiles.maxVisible; + let visibleOpenEditors = configuration && configuration.explorer && configuration.explorer.openEditors && configuration.explorer.openEditors.maxVisible; if (typeof visibleOpenEditors === 'number') { this.maxVisibleOpenEditors = visibleOpenEditors; } else { this.maxVisibleOpenEditors = OpenEditorsView.DEFAULT_MAX_VISIBLE_OPEN_EDITORS; } - // TODO@isidor change configuration name - let dynamicHeight = configuration && configuration.explorer && configuration.explorer.workingFiles && configuration.explorer.workingFiles.dynamicHeight; + let dynamicHeight = configuration && configuration.explorer && configuration.explorer.openEditors && configuration.explorer.openEditors.dynamicHeight; if (typeof dynamicHeight === 'boolean') { this.dynamicHeight = dynamicHeight; } else { diff --git a/src/vs/workbench/parts/files/browser/views/workingFilesView.ts b/src/vs/workbench/parts/files/browser/views/workingFilesView.ts index 419653f7e87..6ddc7b3cd38 100644 --- a/src/vs/workbench/parts/files/browser/views/workingFilesView.ts +++ b/src/vs/workbench/parts/files/browser/views/workingFilesView.ts @@ -103,19 +103,19 @@ export class WorkingFilesView extends AdaptiveCollapsibleViewletView { } private onConfigurationUpdated(configuration: IFilesConfiguration): void { - let visibleWorkingFiles = configuration && configuration.explorer && configuration.explorer.workingFiles && configuration.explorer.workingFiles.maxVisible; - if (typeof visibleWorkingFiles === 'number') { - this.maxVisibleWorkingFiles = visibleWorkingFiles; - } else { - this.maxVisibleWorkingFiles = WorkingFilesView.DEFAULT_MAX_VISIBLE_FILES; - } - - let dynamicHeight = configuration && configuration.explorer && configuration.explorer.workingFiles && configuration.explorer.workingFiles.dynamicHeight; - if (typeof dynamicHeight === 'boolean') { - this.dynamicHeight = dynamicHeight; - } else { - this.dynamicHeight = WorkingFilesView.DEFAULT_DYNAMIC_HEIGHT; - } + // let visibleWorkingFiles = configuration && configuration.explorer && configuration.explorer.workingFiles && configuration.explorer.workingFiles.maxVisible; + // if (typeof visibleWorkingFiles === 'number') { + // this.maxVisibleWorkingFiles = visibleWorkingFiles; + // } else { + // this.maxVisibleWorkingFiles = WorkingFilesView.DEFAULT_MAX_VISIBLE_FILES; + // } + + // let dynamicHeight = configuration && configuration.explorer && configuration.explorer.workingFiles && configuration.explorer.workingFiles.dynamicHeight; + // if (typeof dynamicHeight === 'boolean') { + // this.dynamicHeight = dynamicHeight; + // } else { + // this.dynamicHeight = WorkingFilesView.DEFAULT_DYNAMIC_HEIGHT; + // } // Adjust expanded body size this.expandedBodySize = this.getExpandedBodySize(this.model); diff --git a/src/vs/workbench/parts/files/common/files.ts b/src/vs/workbench/parts/files/common/files.ts index 8fe9010da9e..98ae3641325 100644 --- a/src/vs/workbench/parts/files/common/files.ts +++ b/src/vs/workbench/parts/files/common/files.ts @@ -63,7 +63,7 @@ export abstract class FileEditorInput extends EditorInput implements IFileEditor export interface IFilesConfiguration extends IFilesConfiguration { explorer: { - workingFiles: { + openEditors: { maxVisible: number; dynamicHeight: boolean; }; -- GitLab