diff --git a/src/vs/code/electron-main/window.ts b/src/vs/code/electron-main/window.ts index dc51f57df9f..4ad189405ea 100644 --- a/src/vs/code/electron-main/window.ts +++ b/src/vs/code/electron-main/window.ts @@ -18,6 +18,7 @@ import { parseArgs } from 'vs/platform/environment/node/argv'; import product from 'vs/platform/product'; import { getCommonHTTPHeaders } from 'vs/platform/environment/node/http'; import { IBackupMainService } from 'vs/platform/backup/common/backup'; +import { IWindowSettings } from 'vs/platform/windows/common/windows'; import Uri from 'vs/base/common/uri'; export interface IWindowState { @@ -115,15 +116,6 @@ export interface IWindowConfiguration extends ParsedArgs { untitledToRestore?: IPath[]; } -export interface IWindowSettings { - openFilesInNewWindow: boolean; - reopenFolders: 'all' | 'one' | 'none'; - restoreFullscreen: boolean; - fullScreenZenMode: boolean; - zoomLevel: number; - titleBarStyle: 'native' | 'custom'; -} - export class VSCodeWindow { public static menuBarHiddenKey = 'menuBarHidden'; diff --git a/src/vs/code/electron-main/windows.ts b/src/vs/code/electron-main/windows.ts index 4d5ac240e8f..345a3f27a86 100644 --- a/src/vs/code/electron-main/windows.ts +++ b/src/vs/code/electron-main/windows.ts @@ -17,7 +17,7 @@ import { IBackupMainService } from 'vs/platform/backup/common/backup'; import { trim } from 'vs/base/common/strings'; import { IEnvironmentService, ParsedArgs } from 'vs/platform/environment/common/environment'; import { IStorageService } from 'vs/code/electron-main/storage'; -import { IPath, VSCodeWindow, ReadyState, IWindowConfiguration, IWindowState as ISingleWindowState, defaultWindowState, IWindowSettings } from 'vs/code/electron-main/window'; +import { IPath, VSCodeWindow, ReadyState, IWindowConfiguration, IWindowState as ISingleWindowState, defaultWindowState } from 'vs/code/electron-main/window'; import { ipcMain as ipc, app, screen, BrowserWindow, dialog } from 'electron'; import { IPathWithLineAndColumn, parseLineAndColumnAware } from 'vs/code/electron-main/paths'; import { ILifecycleService } from 'vs/code/electron-main/lifecycle'; @@ -26,6 +26,7 @@ import { ILogService } from 'vs/code/electron-main/log'; import { getPathLabel } from 'vs/base/common/labels'; import { createDecorator, IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; +import { IWindowSettings } from 'vs/platform/windows/common/windows'; import CommonEvent, { Emitter } from 'vs/base/common/event'; import product from 'vs/platform/product'; import Uri from 'vs/base/common/uri'; diff --git a/src/vs/platform/windows/common/windows.ts b/src/vs/platform/windows/common/windows.ts index ebf203412f6..2c4b078a35f 100644 --- a/src/vs/platform/windows/common/windows.ts +++ b/src/vs/platform/windows/common/windows.ts @@ -82,4 +82,13 @@ export interface IWindowService { isMaximized(): TPromise; maximizeWindow(): TPromise; unmaximizeWindow(): TPromise; -} \ No newline at end of file +} + +export interface IWindowSettings { + openFilesInNewWindow: boolean; + reopenFolders: 'all' | 'one' | 'none'; + restoreFullscreen: boolean; + fullScreenZenMode: boolean; + zoomLevel: number; + titleBarStyle: 'native' | 'custom'; +} diff --git a/src/vs/workbench/electron-browser/common.ts b/src/vs/workbench/electron-browser/common.ts index 0d758e6e56a..8a556af9a33 100644 --- a/src/vs/workbench/electron-browser/common.ts +++ b/src/vs/workbench/electron-browser/common.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; +import { IWindowSettings } from 'vs/platform/windows/common/windows'; export interface IPath { filePath: string; @@ -19,14 +19,7 @@ export interface IOpenFileRequest { } export interface IWindowConfiguration { - window: { - openFilesInNewWindow: boolean; - reopenFolders: string; - restoreFullscreen: boolean; - fullScreenZenMode: boolean; - zoomLevel: number; - titleBarStyle: 'native' | 'custom'; - }; + window: IWindowSettings; } export interface IStartupFingerprint {