提交 9ff8ae03 编写于 作者: S SteVen Batten

some fixes for mac web

上级 ffecce04
...@@ -9,7 +9,7 @@ import { EventType, addDisposableListener, addClass, removeClass, isAncestor, ge ...@@ -9,7 +9,7 @@ import { EventType, addDisposableListener, addClass, removeClass, isAncestor, ge
import { onDidChangeFullscreen, isFullscreen, getZoomFactor } from 'vs/base/browser/browser'; import { onDidChangeFullscreen, isFullscreen, getZoomFactor } from 'vs/base/browser/browser';
import { IBackupFileService } from 'vs/workbench/services/backup/common/backup'; import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
import { Registry } from 'vs/platform/registry/common/platform'; import { Registry } from 'vs/platform/registry/common/platform';
import { isWindows, isLinux, isMacintosh, isWeb } from 'vs/base/common/platform'; import { isWindows, isLinux, isMacintosh, isWeb, isNative } from 'vs/base/common/platform';
import { pathsToEditors } from 'vs/workbench/common/editor'; import { pathsToEditors } from 'vs/workbench/common/editor';
import { SidebarPart } from 'vs/workbench/browser/parts/sidebar/sidebarPart'; import { SidebarPart } from 'vs/workbench/browser/parts/sidebar/sidebarPart';
import { PanelPart } from 'vs/workbench/browser/parts/panel/panelPart'; import { PanelPart } from 'vs/workbench/browser/parts/panel/panelPart';
...@@ -229,7 +229,7 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi ...@@ -229,7 +229,7 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
} }
// Menubar visibility changes // Menubar visibility changes
if ((isWindows || isLinux) && getTitleBarStyle(this.configurationService, this.environmentService) === 'custom') { if ((isWindows || isLinux || isWeb) && getTitleBarStyle(this.configurationService, this.environmentService) === 'custom') {
this._register(this.titleService.onMenubarVisibilityChange(visible => this.onMenubarToggled(visible))); this._register(this.titleService.onMenubarVisibilityChange(visible => this.onMenubarToggled(visible)));
} }
} }
...@@ -535,7 +535,7 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi ...@@ -535,7 +535,7 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
return false; return false;
} else if (!this.state.fullscreen) { } else if (!this.state.fullscreen) {
return true; return true;
} else if (isMacintosh) { } else if (isMacintosh && isNative) {
return false; return false;
} else if (this.state.menuBar.visibility === 'visible') { } else if (this.state.menuBar.visibility === 'visible') {
return true; return true;
......
...@@ -298,7 +298,7 @@ import { isMacintosh, isWindows, isLinux, isWeb } from 'vs/base/common/platform' ...@@ -298,7 +298,7 @@ import { isMacintosh, isWindows, isLinux, isWeb } from 'vs/base/common/platform'
'default': true, 'default': true,
'scope': ConfigurationScope.APPLICATION, 'scope': ConfigurationScope.APPLICATION,
'description': nls.localize('enableMenuBarMnemonics', "If enabled, the main menus can be opened via Alt-key shortcuts. Disabling mnemonics allows to bind these Alt-key shortcuts to editor commands instead."), 'description': nls.localize('enableMenuBarMnemonics', "If enabled, the main menus can be opened via Alt-key shortcuts. Disabling mnemonics allows to bind these Alt-key shortcuts to editor commands instead."),
'included': isWindows || isLinux || isWeb 'included': isWindows || isLinux
}, },
'window.disableCustomMenuBarAltFocus': { 'window.disableCustomMenuBarAltFocus': {
'type': 'boolean', 'type': 'boolean',
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册