Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
徽霖
Vscode
提交
e53f1925
V
Vscode
项目概览
徽霖
/
Vscode
通知
9
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
Vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
e53f1925
编写于
7月 13, 2019
作者:
B
Benjamin Pasero
提交者:
GitHub
7月 13, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix #76232 (#77266)
上级
5106b556
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
20 addition
and
17 deletion
+20
-17
src/vs/base/browser/ui/dialog/dialog.ts
src/vs/base/browser/ui/dialog/dialog.ts
+20
-17
未找到文件。
src/vs/base/browser/ui/dialog/dialog.ts
浏览文件 @
e53f1925
...
...
@@ -15,7 +15,7 @@ import { ButtonGroup, IButtonStyles } from 'vs/base/browser/ui/button/button';
import
{
ActionBar
}
from
'
vs/base/browser/ui/actionbar/actionbar
'
;
import
{
Action
}
from
'
vs/base/common/actions
'
;
import
{
mnemonicButtonLabel
}
from
'
vs/base/common/labels
'
;
import
{
isMacintosh
}
from
'
vs/base/common/platform
'
;
import
{
isMacintosh
,
isLinux
}
from
'
vs/base/common/platform
'
;
export
interface
IDialogOptions
{
cancelId
?:
number
;
...
...
@@ -97,9 +97,9 @@ export class Dialog extends Disposable {
clearNode
(
this
.
buttonsContainer
);
let
focusedButton
=
0
;
this
.
buttonGroup
=
new
ButtonGroup
(
this
.
buttonsContainer
,
this
.
buttons
.
length
,
{
title
:
true
});
const
buttonGroup
=
this
.
buttonGroup
=
new
ButtonGroup
(
this
.
buttonsContainer
,
this
.
buttons
.
length
,
{
title
:
true
});
const
buttonMap
=
this
.
rearrangeButtons
(
this
.
buttons
,
this
.
options
.
cancelId
);
this
.
buttonGroup
.
buttons
.
forEach
((
button
,
index
)
=>
{
buttonGroup
.
buttons
.
forEach
((
button
,
index
)
=>
{
button
.
label
=
mnemonicButtonLabel
(
buttonMap
[
index
].
label
,
true
);
this
.
_register
(
button
.
onDidClick
(
e
=>
{
...
...
@@ -115,18 +115,16 @@ export class Dialog extends Disposable {
}
let
eventHandled
=
false
;
if
(
this
.
buttonGroup
)
{
if
(
evt
.
equals
(
KeyMod
.
Shift
|
KeyCode
.
Tab
)
||
evt
.
equals
(
KeyCode
.
LeftArrow
))
{
focusedButton
=
focusedButton
+
this
.
buttonGroup
.
buttons
.
length
-
1
;
focusedButton
=
focusedButton
%
this
.
buttonGroup
.
buttons
.
length
;
this
.
buttonGroup
.
buttons
[
focusedButton
].
focus
();
eventHandled
=
true
;
}
else
if
(
evt
.
equals
(
KeyCode
.
Tab
)
||
evt
.
equals
(
KeyCode
.
RightArrow
))
{
focusedButton
++
;
focusedButton
=
focusedButton
%
this
.
buttonGroup
.
buttons
.
length
;
this
.
buttonGroup
.
buttons
[
focusedButton
].
focus
();
eventHandled
=
true
;
}
if
(
evt
.
equals
(
KeyMod
.
Shift
|
KeyCode
.
Tab
)
||
evt
.
equals
(
KeyCode
.
LeftArrow
))
{
focusedButton
=
focusedButton
+
buttonGroup
.
buttons
.
length
-
1
;
focusedButton
=
focusedButton
%
buttonGroup
.
buttons
.
length
;
buttonGroup
.
buttons
[
focusedButton
].
focus
();
eventHandled
=
true
;
}
else
if
(
evt
.
equals
(
KeyCode
.
Tab
)
||
evt
.
equals
(
KeyCode
.
RightArrow
))
{
focusedButton
++
;
focusedButton
=
focusedButton
%
buttonGroup
.
buttons
.
length
;
buttonGroup
.
buttons
[
focusedButton
].
focus
();
eventHandled
=
true
;
}
if
(
eventHandled
)
{
...
...
@@ -192,7 +190,11 @@ export class Dialog extends Disposable {
show
(
this
.
element
);
// Focus first element
this
.
buttonGroup
.
buttons
[
focusedButton
].
focus
();
buttonMap
.
forEach
((
value
,
index
)
=>
{
if
(
value
.
index
===
focusedButton
)
{
buttonGroup
.
buttons
[
index
].
focus
();
}
});
});
}
...
...
@@ -243,7 +245,8 @@ export class Dialog extends Disposable {
buttonMap
.
push
({
label
:
button
,
index
:
index
});
});
if
(
isMacintosh
)
{
// macOS/linux: reverse button order
if
(
isMacintosh
||
isLinux
)
{
if
(
cancelId
!==
undefined
)
{
const
cancelButton
=
buttonMap
.
splice
(
cancelId
,
1
)[
0
];
buttonMap
.
reverse
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录