提交 c1845617 编写于 作者: S SteVen Batten

refs #76442

上级 8c2de5ef
...@@ -59,7 +59,7 @@ export abstract class MenubarControl extends Disposable { ...@@ -59,7 +59,7 @@ export abstract class MenubarControl extends Disposable {
[index: string]: IMenu | undefined; [index: string]: IMenu | undefined;
}; };
protected topLevelTitles = { protected topLevelTitles: { [menu: string]: string } = {
'File': nls.localize({ key: 'mFile', comment: ['&& denotes a mnemonic'] }, "&&File"), 'File': nls.localize({ key: 'mFile', comment: ['&& denotes a mnemonic'] }, "&&File"),
'Edit': nls.localize({ key: 'mEdit', comment: ['&& denotes a mnemonic'] }, "&&Edit"), 'Edit': nls.localize({ key: 'mEdit', comment: ['&& denotes a mnemonic'] }, "&&Edit"),
'Selection': nls.localize({ key: 'mSelection', comment: ['&& denotes a mnemonic'] }, "&&Selection"), 'Selection': nls.localize({ key: 'mSelection', comment: ['&& denotes a mnemonic'] }, "&&Selection"),
...@@ -407,9 +407,12 @@ export class NativeMenubarControl extends MenubarControl { ...@@ -407,9 +407,12 @@ export class NativeMenubarControl extends MenubarControl {
} }
private getAdditionalKeybindings(): { [id: string]: IMenubarKeybinding } { private getAdditionalKeybindings(): { [id: string]: IMenubarKeybinding } {
const keybindings = {}; const keybindings: { [id: string]: IMenubarKeybinding } = {};
if (isMacintosh) { if (isMacintosh) {
keybindings['workbench.action.quit'] = (this.getMenubarKeybinding('workbench.action.quit')); const keybinding = this.getMenubarKeybinding('workbench.action.quit');
if (keybinding) {
keybindings['workbench.action.quit'] = keybinding;
}
} }
return keybindings; return keybindings;
......
...@@ -494,9 +494,9 @@ export class TitlebarPart extends Part implements ITitleService { ...@@ -494,9 +494,9 @@ export class TitlebarPart extends Part implements ITitleService {
private onUpdateAppIconDragBehavior() { private onUpdateAppIconDragBehavior() {
const setting = this.configurationService.getValue('window.doubleClickIconToClose'); const setting = this.configurationService.getValue('window.doubleClickIconToClose');
if (setting) { if (setting) {
this.appIcon.style['-webkit-app-region'] = 'no-drag'; (this.appIcon.style as any)['-webkit-app-region'] = 'no-drag';
} else { } else {
this.appIcon.style['-webkit-app-region'] = 'drag'; (this.appIcon.style as any)['-webkit-app-region'] = 'drag';
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册