Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
1bac8550
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,发现更多精彩内容 >>
提交
1bac8550
编写于
4月 15, 2019
作者:
S
SteVen Batten
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
improve keybinding handling in dialogs
上级
c61e5d90
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
35 addition
and
4 deletion
+35
-4
src/vs/base/browser/ui/dialog/dialog.ts
src/vs/base/browser/ui/dialog/dialog.ts
+9
-1
src/vs/platform/dialogs/browser/dialogService.ts
src/vs/platform/dialogs/browser/dialogService.ts
+6
-1
src/vs/workbench/services/progress/browser/progressService2.ts
...s/workbench/services/progress/browser/progressService2.ts
+20
-2
未找到文件。
src/vs/base/browser/ui/dialog/dialog.ts
浏览文件 @
1bac8550
...
...
@@ -20,6 +20,7 @@ export interface IDialogOptions {
cancelId
?:
number
;
detail
?:
string
;
type
?:
'
none
'
|
'
info
'
|
'
error
'
|
'
question
'
|
'
warning
'
|
'
pending
'
;
keyEventProcessor
?:
(
event
:
StandardKeyboardEvent
)
=>
void
;
}
export
interface
IDialogStyles
extends
IButtonStyles
{
...
...
@@ -103,19 +104,26 @@ export class Dialog extends Disposable {
return
;
}
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
(
eventHandled
)
{
EventHelper
.
stop
(
e
,
true
);
}
else
if
(
this
.
options
.
keyEventProcessor
)
{
this
.
options
.
keyEventProcessor
(
evt
);
}
}));
this
.
_register
(
domEvent
(
window
,
'
keyup
'
,
true
)((
e
:
KeyboardEvent
)
=>
{
...
...
src/vs/platform/dialogs/browser/dialogService.ts
浏览文件 @
1bac8550
...
...
@@ -13,6 +13,8 @@ import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
import
{
IThemeService
}
from
'
vs/platform/theme/common/themeService
'
;
import
{
attachDialogStyler
}
from
'
vs/platform/theme/common/styler
'
;
import
{
dispose
,
IDisposable
}
from
'
vs/base/common/lifecycle
'
;
import
{
StandardKeyboardEvent
}
from
'
vs/base/browser/keyboardEvent
'
;
import
{
EventHelper
}
from
'
vs/base/browser/dom
'
;
export
class
DialogService
implements
IDialogService
{
_serviceBrand
:
any
;
...
...
@@ -76,7 +78,10 @@ export class DialogService implements IDialogService {
{
detail
:
options
?
options
.
detail
:
undefined
,
cancelId
:
options
?
options
.
cancelId
:
undefined
,
type
:
this
.
getDialogType
(
severity
)
type
:
this
.
getDialogType
(
severity
),
keyEventProcessor
:
(
event
:
StandardKeyboardEvent
)
=>
{
EventHelper
.
stop
(
event
,
true
);
}
});
dialogDisposables
.
push
(
dialog
);
...
...
src/vs/workbench/services/progress/browser/progressService2.ts
浏览文件 @
1bac8550
...
...
@@ -20,6 +20,9 @@ import { ILayoutService } from 'vs/platform/layout/browser/layoutService';
import
{
Dialog
}
from
'
vs/base/browser/ui/dialog/dialog
'
;
import
{
attachDialogStyler
}
from
'
vs/platform/theme/common/styler
'
;
import
{
IThemeService
}
from
'
vs/platform/theme/common/themeService
'
;
import
{
IKeybindingService
}
from
'
vs/platform/keybinding/common/keybinding
'
;
import
{
StandardKeyboardEvent
}
from
'
vs/base/browser/keyboardEvent
'
;
import
{
EventHelper
}
from
'
vs/base/browser/dom
'
;
export
class
ProgressService2
implements
IProgressService2
{
...
...
@@ -34,7 +37,8 @@ export class ProgressService2 implements IProgressService2 {
@
INotificationService
private
readonly
_notificationService
:
INotificationService
,
@
IStatusbarService
private
readonly
_statusbarService
:
IStatusbarService
,
@
ILayoutService
private
readonly
_layoutService
:
ILayoutService
,
@
IThemeService
private
readonly
_themeService
:
IThemeService
@
IThemeService
private
readonly
_themeService
:
IThemeService
,
@
IKeybindingService
private
readonly
_keybindingService
:
IKeybindingService
)
{
}
withProgress
<
R
=
unknown
>
(
options
:
IProgressOptions
,
task
:
(
progress
:
IProgress
<
IProgressStep
>
)
=>
Promise
<
R
>
,
onDidCancel
?:
()
=>
void
):
Promise
<
R
>
{
...
...
@@ -276,6 +280,10 @@ export class ProgressService2 implements IProgressService2 {
private
_withDialogProgress
<
P
extends
Promise
<
R
>
,
R
=
unknown
>
(
options
:
IProgressOptions
,
task
:
(
progress
:
IProgress
<
{
message
?:
string
,
increment
?:
number
}
>
)
=>
P
,
onDidCancel
?:
()
=>
void
):
P
{
const
disposables
:
IDisposable
[]
=
[];
const
allowableCommands
=
[
'
workbench.action.quit
'
,
'
workbench.action.reloadWindow
'
];
let
dialog
:
Dialog
;
...
...
@@ -284,7 +292,17 @@ export class ProgressService2 implements IProgressService2 {
this
.
_layoutService
.
container
,
message
,
[
options
.
cancellable
?
localize
(
'
cancel
'
,
"
Cancel
"
)
:
localize
(
'
dismiss
'
,
"
Dismiss
"
)],
{
type
:
'
pending
'
}
{
type
:
'
pending
'
,
keyEventProcessor
:
(
event
:
StandardKeyboardEvent
)
=>
{
const
resolved
=
this
.
_keybindingService
.
softDispatch
(
event
,
this
.
_layoutService
.
container
);
if
(
resolved
&&
resolved
.
commandId
)
{
if
(
allowableCommands
.
indexOf
(
resolved
.
commandId
)
===
-
1
)
{
EventHelper
.
stop
(
event
,
true
);
}
}
}
}
);
disposables
.
push
(
dialog
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录