mirror of
https://github.com/Microsoft/vscode
synced 2024-08-27 13:00:58 +00:00
fix #14468
This commit is contained in:
parent
7daa2494d0
commit
0e4fa466b1
|
@ -108,7 +108,6 @@ export class SideBySideEditorControl implements ISideBySideEditorControl, IVerti
|
|||
private dragging: boolean;
|
||||
|
||||
private layoutVertically: boolean;
|
||||
private defaultEditorGroupOrientation: GroupOrientation;
|
||||
|
||||
private showTabs: boolean;
|
||||
private showIcons: boolean;
|
||||
|
@ -170,7 +169,7 @@ export class SideBySideEditorControl implements ISideBySideEditorControl, IVerti
|
|||
|
||||
this.onConfigurationUpdated(this.configurationService.getConfiguration<IWorkbenchEditorConfiguration>());
|
||||
|
||||
const editorGroupOrientation = groupOrientation || this.defaultEditorGroupOrientation;
|
||||
const editorGroupOrientation = groupOrientation || 'vertical';
|
||||
this.layoutVertically = (editorGroupOrientation !== 'horizontal');
|
||||
|
||||
this.create();
|
||||
|
@ -212,11 +211,9 @@ export class SideBySideEditorControl implements ISideBySideEditorControl, IVerti
|
|||
if (config.workbench && config.workbench.editor) {
|
||||
this.showTabs = config.workbench.editor.showTabs;
|
||||
this.showIcons = config.workbench.editor.showIcons;
|
||||
this.defaultEditorGroupOrientation = (config.workbench.editor.defaultEditorGroupLayout === 'horizontal') ? 'horizontal' : 'vertical';
|
||||
} else {
|
||||
this.showTabs = true;
|
||||
this.showIcons = false;
|
||||
this.defaultEditorGroupOrientation = 'vertical';
|
||||
}
|
||||
|
||||
if (!refresh) {
|
||||
|
|
|
@ -11,7 +11,7 @@ import URI from 'vs/base/common/uri';
|
|||
import { IEditor, ICommonCodeEditor, IEditorViewState, IEditorOptions as ICodeEditorOptions } from 'vs/editor/common/editorCommon';
|
||||
import { IEditorInput, IEditorModel, IEditorOptions, ITextEditorOptions, IResourceInput, Position } from 'vs/platform/editor/common/editor';
|
||||
import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
|
||||
import { IEditorGroupService, GroupOrientation } from 'vs/workbench/services/group/common/groupService';
|
||||
import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
|
||||
import { SyncDescriptor, AsyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
|
||||
import { IInstantiationService, IConstructorSignature0 } from 'vs/platform/instantiation/common/instantiation';
|
||||
import { IModel } from 'vs/editor/common/editorCommon';
|
||||
|
@ -861,7 +861,6 @@ export interface IWorkbenchEditorConfiguration {
|
|||
enablePreview: boolean;
|
||||
enablePreviewFromQuickOpen: boolean;
|
||||
openPositioning: 'left' | 'right' | 'first' | 'last';
|
||||
defaultEditorGroupLayout: GroupOrientation;
|
||||
}
|
||||
};
|
||||
}
|
||||
|
|
|
@ -74,12 +74,6 @@ configurationRegistry.registerConfiguration({
|
|||
'title': nls.localize('workbenchConfigurationTitle', "Workbench"),
|
||||
'type': 'object',
|
||||
'properties': {
|
||||
'workbench.editor.defaultEditorGroupLayout': {
|
||||
'type': 'string',
|
||||
'enum': ['vertical', 'horizontal'],
|
||||
'default': 'vertical',
|
||||
'description': nls.localize('defaultEditorGroupLayout', "Controls how multiple editor groups should layout by default if no other user choice has been made.")
|
||||
},
|
||||
'workbench.editor.showTabs': {
|
||||
'type': 'boolean',
|
||||
'description': nls.localize('showEditorTabs', "Controls if opened editors should show in tabs or not."),
|
||||
|
|
Loading…
Reference in a new issue