Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
0e86dd63
V
vscode
项目概览
xxadev
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
0e86dd63
编写于
11月 23, 2018
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
MenuItemActionItem only listens to alt-key when having an alt-command
上级
68174933
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
14 addition
and
11 deletion
+14
-11
src/vs/platform/actions/browser/menuItemActionItem.ts
src/vs/platform/actions/browser/menuItemActionItem.ts
+14
-11
未找到文件。
src/vs/platform/actions/browser/menuItemActionItem.ts
浏览文件 @
0e86dd63
...
@@ -128,14 +128,16 @@ export class MenuItemActionItem extends ActionItem {
...
@@ -128,14 +128,16 @@ export class MenuItemActionItem extends ActionItem {
private
_wantsAltCommand
:
boolean
;
private
_wantsAltCommand
:
boolean
;
private
_itemClassDispose
:
IDisposable
;
private
_itemClassDispose
:
IDisposable
;
private
readonly
_altKey
:
AlternativeKeyEmitter
;
constructor
(
constructor
(
public
_action
:
MenuItemAction
,
readonly
_action
:
MenuItemAction
,
@
IKeybindingService
private
readonly
_keybindingService
:
IKeybindingService
,
@
IKeybindingService
private
readonly
_keybindingService
:
IKeybindingService
,
@
INotificationService
protected
_notificationService
:
INotificationService
,
@
INotificationService
protected
_notificationService
:
INotificationService
,
@
IContextMenuService
private
readonly
_contextMenuService
:
IContextMenuService
@
IContextMenuService
_contextMenuService
:
IContextMenuService
)
{
)
{
super
(
undefined
,
_action
,
{
icon
:
!!
(
_action
.
class
||
_action
.
item
.
iconLocation
),
label
:
!
_action
.
class
&&
!
_action
.
item
.
iconLocation
});
super
(
undefined
,
_action
,
{
icon
:
!!
(
_action
.
class
||
_action
.
item
.
iconLocation
),
label
:
!
_action
.
class
&&
!
_action
.
item
.
iconLocation
});
this
.
_altKey
=
AlternativeKeyEmitter
.
getInstance
(
_contextMenuService
);
}
}
protected
get
_commandAction
():
IAction
{
protected
get
_commandAction
():
IAction
{
...
@@ -146,9 +148,8 @@ export class MenuItemActionItem extends ActionItem {
...
@@ -146,9 +148,8 @@ export class MenuItemActionItem extends ActionItem {
event
.
preventDefault
();
event
.
preventDefault
();
event
.
stopPropagation
();
event
.
stopPropagation
();
const
altKey
=
AlternativeKeyEmitter
.
getInstance
(
this
.
_contextMenuService
);
if
(
this
.
_altKey
.
isPressed
)
{
if
(
altKey
.
isPressed
)
{
this
.
_altKey
.
suppressAltKeyUp
();
altKey
.
suppressAltKeyUp
();
}
}
this
.
actionRunner
.
run
(
this
.
_commandAction
)
this
.
actionRunner
.
run
(
this
.
_commandAction
)
...
@@ -161,8 +162,8 @@ export class MenuItemActionItem extends ActionItem {
...
@@ -161,8 +162,8 @@ export class MenuItemActionItem extends ActionItem {
this
.
_updateItemClass
(
this
.
_action
.
item
);
this
.
_updateItemClass
(
this
.
_action
.
item
);
let
mouseOver
=
false
;
let
mouseOver
=
false
;
const
alternativeKeyEmitter
=
AlternativeKeyEmitter
.
getInstance
(
this
.
_contextMenuService
);
let
alternativeKeyDown
=
alternativeKeyEmitter
.
isPressed
;
let
alternativeKeyDown
=
this
.
_altKey
.
isPressed
;
const
updateAltState
=
()
=>
{
const
updateAltState
=
()
=>
{
const
wantsAltCommand
=
mouseOver
&&
alternativeKeyDown
;
const
wantsAltCommand
=
mouseOver
&&
alternativeKeyDown
;
...
@@ -174,10 +175,12 @@ export class MenuItemActionItem extends ActionItem {
...
@@ -174,10 +175,12 @@ export class MenuItemActionItem extends ActionItem {
}
}
};
};
this
.
_register
(
alternativeKeyEmitter
.
event
(
value
=>
{
if
(
this
.
_action
.
alt
)
{
alternativeKeyDown
=
value
;
this
.
_register
(
this
.
_altKey
.
event
(
value
=>
{
updateAltState
();
alternativeKeyDown
=
value
;
}));
updateAltState
();
}));
}
this
.
_register
(
domEvent
(
container
,
'
mouseleave
'
)(
_
=>
{
this
.
_register
(
domEvent
(
container
,
'
mouseleave
'
)(
_
=>
{
mouseOver
=
false
;
mouseOver
=
false
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录