提交 727f4bbb 编写于 作者: D David Terry

remove unused code related to old menu bar toggling mechanism

上级 6b2fcaaa
......@@ -126,7 +126,6 @@ export interface IVSCodeWindow {
export class VSCodeWindow implements IVSCodeWindow {
public static menuBarHiddenKey = 'menuBarHidden';
public static colorThemeStorageKey = 'theme';
private static MIN_WIDTH = 200;
......
......@@ -117,7 +117,6 @@ export interface IWindowsMainService {
removeFromRecentPathsList(path: string): void;
removeFromRecentPathsList(paths: string[]): void;
clearRecentPathsList(): void;
toggleMenuBar(windowId: number): void;
quit(): void;
}
......@@ -1159,28 +1158,6 @@ export class WindowsManager implements IWindowsMainService {
return pathA === pathB;
}
public toggleMenuBar(windowId: number): void {
// Update in settings
const menuBarHidden = this.storageService.getItem(VSCodeWindow.menuBarHiddenKey, false);
const newMenuBarHidden = !menuBarHidden;
const windowConfig = this.configurationService.getConfiguration<IWindowSettings>('window');
let menuBarVisibility = windowConfig && windowConfig.menuBarVisibility;
this.storageService.setItem(VSCodeWindow.menuBarHiddenKey, newMenuBarHidden);
// Update across windows
WindowsManager.WINDOWS.forEach(w => w.setMenuBarVisibility(menuBarVisibility));
// Inform user if menu bar is now hidden
if (newMenuBarHidden && menuBarVisibility === 'toggle') {
const vscodeWindow = this.getWindowById(windowId);
if (vscodeWindow) {
vscodeWindow.send('vscode:showInfoMessage', nls.localize('hiddenMenuBar', "You can still access the menu bar by pressing the **Alt** key."));
}
}
}
private updateWindowsJumpList(): void {
if (!platform.isWindows) {
return; // only on windows
......
......@@ -36,7 +36,6 @@ export interface IWindowsService {
maximizeWindow(windowId: number): TPromise<void>;
unmaximizeWindow(windowId: number): TPromise<void>;
setDocumentEdited(windowId: number, flag: boolean): TPromise<void>;
toggleMenuBar(windowId: number): TPromise<void>;
quit(): TPromise<void>;
// Global methods
......@@ -80,7 +79,6 @@ export interface IWindowService {
getRecentlyOpen(): TPromise<{ files: string[]; folders: string[]; }>;
focusWindow(): TPromise<void>;
setDocumentEdited(flag: boolean): TPromise<void>;
toggleMenuBar(): TPromise<void>;
isMaximized(): TPromise<boolean>;
maximizeWindow(): TPromise<void>;
unmaximizeWindow(): TPromise<void>;
......
......@@ -29,7 +29,6 @@ export interface IWindowsChannel extends IChannel {
call(command: 'maximizeWindow', arg: number): TPromise<void>;
call(command: 'unmaximizeWindow', arg: number): TPromise<void>;
call(command: 'setDocumentEdited', arg: [number, boolean]): TPromise<void>;
call(command: 'toggleMenuBar', arg: number): TPromise<void>;
call(command: 'quit'): TPromise<void>;
call(command: 'windowOpen', arg: [string[], boolean]): TPromise<void>;
call(command: 'openNewWindow'): TPromise<void>;
......@@ -75,7 +74,6 @@ export class WindowsChannel implements IWindowsChannel {
case 'maximizeWindow': return this.service.maximizeWindow(arg);
case 'unmaximizeWindow': return this.service.unmaximizeWindow(arg);
case 'setDocumentEdited': return this.service.setDocumentEdited(arg[0], arg[1]);
case 'toggleMenuBar': return this.service.toggleMenuBar(arg);
case 'windowOpen': return this.service.windowOpen(arg[0], arg[1]);
case 'openNewWindow': return this.service.openNewWindow();
case 'showWindow': return this.service.showWindow(arg);
......@@ -171,10 +169,6 @@ export class WindowsChannelClient implements IWindowsService {
return this.channel.call('setDocumentEdited', [windowId, flag]);
}
toggleMenuBar(windowId: number): TPromise<void> {
return this.channel.call('toggleMenuBar', windowId);
}
quit(): TPromise<void> {
return this.channel.call('quit');
}
......@@ -218,4 +212,4 @@ export class WindowsChannelClient implements IWindowsService {
startCrashReporter(config: Electron.CrashReporterStartOptions): TPromise<void> {
return this.channel.call('startCrashReporter', config);
}
}
\ No newline at end of file
}
......@@ -89,7 +89,4 @@ export class WindowService implements IWindowService {
return this.windowsService.setDocumentEdited(this.windowId, flag);
}
toggleMenuBar(): TPromise<void> {
return this.windowsService.toggleMenuBar(this.windowId);
}
}
\ No newline at end of file
}
......@@ -193,11 +193,6 @@ export class WindowsService implements IWindowsService, IDisposable {
return TPromise.as(null);
}
toggleMenuBar(windowId: number): TPromise<void> {
this.windowsMainService.toggleMenuBar(windowId);
return TPromise.as(null);
}
windowOpen(paths: string[], forceNewWindow?: boolean): TPromise<void> {
if (!paths || !paths.length) {
return TPromise.as(null);
......@@ -278,4 +273,4 @@ export class WindowsService implements IWindowsService, IDisposable {
dispose(): void {
this.disposables = dispose(this.disposables);
}
}
\ No newline at end of file
}
......@@ -690,10 +690,6 @@ export class TestWindowService implements IWindowService {
return TPromise.as(void 0);
}
toggleMenuBar(): TPromise<void> {
return TPromise.as(void 0);
}
isMaximized(): TPromise<boolean> {
return TPromise.as(void 0);
}
......@@ -795,9 +791,6 @@ export class TestWindowsService implements IWindowsService {
setDocumentEdited(windowId: number, flag: boolean): TPromise<void> {
return TPromise.as(void 0);
}
toggleMenuBar(windowId: number): TPromise<void> {
return TPromise.as(void 0);
}
quit(): TPromise<void> {
return TPromise.as(void 0);
}
......@@ -840,4 +833,4 @@ export class TestWindowsService implements IWindowsService {
startCrashReporter(config: Electron.CrashReporterStartOptions): TPromise<void> {
return TPromise.as(void 0);
}
}
\ No newline at end of file
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册