未验证 提交 160b5509 编写于 作者: R rebornix

re #120545

上级 f9901cea
...@@ -84,6 +84,12 @@ interface LayoutQuickPickItem extends IQuickPickItem { ...@@ -84,6 +84,12 @@ interface LayoutQuickPickItem extends IQuickPickItem {
layout: IKeyboardLayoutInfo; layout: IKeyboardLayoutInfo;
} }
interface IUnknownLayout {
text?: string;
lang?: string;
layout?: string;
}
export class KeyboardLayoutPickerAction extends Action { export class KeyboardLayoutPickerAction extends Action {
static readonly ID = KEYBOARD_LAYOUT_OPEN_PICKER; static readonly ID = KEYBOARD_LAYOUT_OPEN_PICKER;
static readonly LABEL = nls.localize('keyboard.chooseLayout', "Change Keyboard Layout"); static readonly LABEL = nls.localize('keyboard.chooseLayout', "Change Keyboard Layout");
...@@ -121,7 +127,7 @@ export class KeyboardLayoutPickerAction extends Action { ...@@ -121,7 +127,7 @@ export class KeyboardLayoutPickerAction extends Action {
return { return {
layout: layout, layout: layout,
label: [layoutInfo.label, (layout && layout.isUserKeyboardLayout) ? '(User configured layout)' : ''].join(' '), label: [layoutInfo.label, (layout && layout.isUserKeyboardLayout) ? '(User configured layout)' : ''].join(' '),
id: (<any>layout).text || (<any>layout).lang || (<any>layout).layout, id: (layout as IUnknownLayout).text || (layout as IUnknownLayout).lang || (layout as IUnknownLayout).layout,
description: layoutInfo.description + (picked ? ' (Current layout)' : ''), description: layoutInfo.description + (picked ? ' (Current layout)' : ''),
picked: !isAutoDetect && areKeyboardLayoutsEqual(currentLayout, layout) picked: !isAutoDetect && areKeyboardLayoutsEqual(currentLayout, layout)
}; };
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册