Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
1d4c7fa5
V
vscode
项目概览
掘金者说
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
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,发现更多精彩内容 >>
提交
1d4c7fa5
编写于
3月 22, 2019
作者:
S
SteVen Batten
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
some dialog fixes
上级
33a1b963
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
60 addition
and
12 deletion
+60
-12
src/vs/base/browser/ui/dialog/dialog.ts
src/vs/base/browser/ui/dialog/dialog.ts
+24
-12
src/vs/workbench/services/dialogs/electron-browser/dialogService.ts
...kbench/services/dialogs/electron-browser/dialogService.ts
+36
-0
未找到文件。
src/vs/base/browser/ui/dialog/dialog.ts
浏览文件 @
1d4c7fa5
...
...
@@ -35,6 +35,7 @@ export class Dialog extends Disposable {
private
iconElement
:
HTMLElement
|
undefined
;
private
toolbarContainer
:
HTMLElement
|
undefined
;
private
buttonGroup
:
ButtonGroup
|
undefined
;
private
styles
:
IDialogStyles
|
undefined
;
constructor
(
private
container
:
HTMLElement
,
private
message
:
string
,
private
buttons
:
string
[],
private
options
:
IDialogOptions
)
{
super
();
...
...
@@ -93,11 +94,11 @@ export class Dialog extends Disposable {
}
if
(
this
.
buttonGroup
)
{
if
((
evt
.
shiftKey
&&
evt
.
equals
(
KeyCode
.
Tab
))
||
evt
.
equals
(
KeyCode
.
Righ
tArrow
))
{
if
((
evt
.
shiftKey
&&
evt
.
equals
(
KeyCode
.
Tab
))
||
evt
.
equals
(
KeyCode
.
Lef
tArrow
))
{
focusedButton
=
focusedButton
+
this
.
buttonGroup
.
buttons
.
length
-
1
;
focusedButton
=
focusedButton
%
this
.
buttonGroup
.
buttons
.
length
;
this
.
buttonGroup
.
buttons
[
focusedButton
].
focus
();
}
else
if
(
evt
.
equals
(
KeyCode
.
Tab
)
||
evt
.
equals
(
KeyCode
.
Lef
tArrow
))
{
}
else
if
(
evt
.
equals
(
KeyCode
.
Tab
)
||
evt
.
equals
(
KeyCode
.
Righ
tArrow
))
{
focusedButton
++
;
focusedButton
=
focusedButton
%
this
.
buttonGroup
.
buttons
.
length
;
this
.
buttonGroup
.
buttons
[
focusedButton
].
focus
();
...
...
@@ -142,6 +143,8 @@ export class Dialog extends Disposable {
actionBar
.
push
(
action
,
{
icon
:
true
,
label
:
false
,
});
this
.
applyStyles
();
show
(
this
.
element
);
// Focus first element
...
...
@@ -149,22 +152,31 @@ export class Dialog extends Disposable {
});
}
style
(
style
:
IDialogStyles
):
void
{
const
fgColor
=
style
.
dialogForeground
?
`
${
style
.
dialogForeground
}
`
:
null
;
const
bgColor
=
style
.
dialogBackground
?
`
${
style
.
dialogBackground
}
`
:
null
;
const
shadowColor
=
style
.
dialogShadow
?
`0 0px 8px
${
style
.
dialogShadow
}
`
:
null
;
private
applyStyles
()
{
if
(
this
.
styles
)
{
const
style
=
this
.
styles
;
if
(
this
.
element
)
{
this
.
element
.
style
.
color
=
fgColor
;
this
.
element
.
style
.
backgroundColor
=
bgColor
;
this
.
element
.
style
.
boxShadow
=
shadowColor
;
const
fgColor
=
style
.
dialogForeground
?
`
${
style
.
dialogForeground
}
`
:
null
;
const
bgColor
=
style
.
dialogBackground
?
`
${
style
.
dialogBackground
}
`
:
null
;
const
shadowColor
=
style
.
dialogShadow
?
`0 0px 8px
${
style
.
dialogShadow
}
`
:
null
;
if
(
this
.
buttonGroup
)
{
this
.
buttonGroup
.
buttons
.
forEach
(
button
=>
button
.
style
(
style
));
if
(
this
.
element
)
{
this
.
element
.
style
.
color
=
fgColor
;
this
.
element
.
style
.
backgroundColor
=
bgColor
;
this
.
element
.
style
.
boxShadow
=
shadowColor
;
if
(
this
.
buttonGroup
)
{
this
.
buttonGroup
.
buttons
.
forEach
(
button
=>
button
.
style
(
style
));
}
}
}
}
style
(
style
:
IDialogStyles
):
void
{
this
.
styles
=
style
;
this
.
applyStyles
();
}
dispose
():
void
{
super
.
dispose
();
if
(
this
.
modal
)
{
...
...
src/vs/workbench/services/dialogs/electron-browser/dialogService.ts
浏览文件 @
1d4c7fa5
...
...
@@ -10,10 +10,14 @@ import { isLinux, isWindows } from 'vs/base/common/platform';
import
{
IWindowService
}
from
'
vs/platform/windows/common/windows
'
;
import
{
mnemonicButtonLabel
}
from
'
vs/base/common/labels
'
;
import
{
IDialogService
,
IConfirmation
,
IConfirmationResult
,
IDialogOptions
}
from
'
vs/platform/dialogs/common/dialogs
'
;
import
{
DialogService
as
HTMLDialogService
}
from
'
vs/platform/dialogs/browser/dialogService
'
;
import
{
ILogService
}
from
'
vs/platform/log/common/log
'
;
import
{
registerSingleton
}
from
'
vs/platform/instantiation/common/extensions
'
;
import
{
ISharedProcessService
}
from
'
vs/platform/ipc/electron-browser/sharedProcessService
'
;
import
{
DialogChannel
}
from
'
vs/platform/dialogs/node/dialogIpc
'
;
import
{
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
import
{
ILayoutService
}
from
'
vs/platform/layout/browser/layoutService
'
;
import
{
IThemeService
}
from
'
vs/platform/theme/common/themeService
'
;
interface
IMassagedMessageBoxOptions
{
...
...
@@ -31,6 +35,38 @@ interface IMassagedMessageBoxOptions {
}
export
class
DialogService
implements
IDialogService
{
_serviceBrand
:
any
;
private
impl
:
IDialogService
;
constructor
(
@
IConfigurationService
configurationService
:
IConfigurationService
,
@
ILogService
logService
:
ILogService
,
@
ILayoutService
layoutService
:
ILayoutService
,
@
IThemeService
themeService
:
IThemeService
,
@
IWindowService
windowService
:
IWindowService
,
@
ISharedProcessService
sharedProcessService
:
ISharedProcessService
)
{
// Use HTML based dialogs
if
(
configurationService
.
getValue
(
'
workbench.dialogs.customEnabled
'
)
===
true
)
{
this
.
impl
=
new
HTMLDialogService
(
logService
,
layoutService
,
themeService
);
}
// Electron dialog service
else
{
this
.
impl
=
new
NativeDialogService
(
windowService
,
logService
,
sharedProcessService
);
}
}
confirm
(
confirmation
:
IConfirmation
):
Promise
<
IConfirmationResult
>
{
return
this
.
impl
.
confirm
(
confirmation
);
}
show
(
severity
:
Severity
,
message
:
string
,
buttons
:
string
[],
options
?:
IDialogOptions
|
undefined
):
Promise
<
number
>
{
return
this
.
impl
.
show
(
severity
,
message
,
buttons
,
options
);
}
}
class
NativeDialogService
implements
IDialogService
{
_serviceBrand
:
any
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录