ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 52dcb723a39ae75bee1bd56b3312d7fcdc87aeed (#6719)

Browse Source
This commit is contained in:
Anthony Dresser
2019-08-12 21:31:51 -07:00
committed by GitHub
parent 00250839fc
commit 7eba8c4c03
616 changed files with 9472 additions and 7087 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/vs/platform/windows/common/windows.ts
View File

@@ -303,7 +303,7 @@ export function getTitleBarStyle(configurationService: IConfigurationService, en
return 'native'; // native tabs on sierra do not work with custom title style
}
const useSimpleFullScreen = false; //isMacintosh && configuration.nativeFullScreen === false;
const useSimpleFullScreen = isMacintosh && configuration.nativeFullScreen === false;
if (useSimpleFullScreen) {
return 'native'; // simple fullscreen does not work well with custom title style (https://github.com/Microsoft/vscode/issues/63291)
}
@@ -426,6 +426,7 @@ export interface IWindowConfiguration extends ParsedArgs {
folderUri?: ISingleFolderWorkspaceIdentifier;
remoteAuthority?: string;
connectionToken?: string;
zoomLevel?: number;
fullscreen?: boolean;
@@ -444,7 +445,6 @@ export interface IWindowConfiguration extends ParsedArgs {
filesToDiff?: IPath[];
filesToWait?: IPathsToWaitFor;
termProgram?: string;
connectionToken?: string;
}
export interface IRunActionInWindowRequest {

2
src/vs/platform/windows/electron-main/windowsService.ts
View File

@@ -27,7 +27,7 @@ import { ServiceIdentifier } from 'vs/platform/instantiation/common/instantiatio
export class WindowsService extends Disposable implements IWindowsService, IURLHandler {
_serviceBrand: ServiceIdentifier<any>;
_serviceBrand!: ServiceIdentifier<any>;
private readonly disposables = this._register(new DisposableStore());