Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
徽霖
Vscode
提交
65cc37ab
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,发现更多精彩内容 >>
提交
65cc37ab
编写于
2月 01, 2019
作者:
M
Martin Aeschlimann
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Installing new color theme causes that theme to become the active theme. Fixes #67688
上级
cf14d2c6
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
16 addition
and
18 deletion
+16
-18
src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts
...services/themes/electron-browser/workbenchThemeService.ts
+16
-18
未找到文件。
src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts
浏览文件 @
65cc37ab
...
...
@@ -171,17 +171,16 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
configurationRegistry
.
notifyConfigurationSchemaUpdated
(
themeSettingsConfiguration
,
tokenColorCustomizationConfiguration
);
if
(
this
.
currentColorTheme
.
isLoaded
)
{
if
(
event
.
added
.
length
>
0
&&
event
.
added
.
length
<
event
.
themes
.
length
)
{
const
themeData
=
await
this
.
colorThemeStore
.
findThemeData
(
this
.
currentColorTheme
.
id
);
if
(
!
themeData
)
{
// current theme is no longer available
prevColorId
=
this
.
currentColorTheme
.
id
;
this
.
setColorTheme
(
event
.
added
[
0
].
id
,
'
auto
'
);
this
.
setColorTheme
(
DEFAULT_THEME_ID
,
'
auto
'
);
}
else
{
const
themeData
=
await
this
.
colorThemeStore
.
findThemeData
(
this
.
currentColorTheme
.
id
);
if
(
!
themeData
)
{
if
(
prevColorId
&&
await
this
.
colorThemeStore
.
findThemeData
(
prevColorId
))
{
this
.
setColorTheme
(
prevColorId
,
'
auto
'
);
}
else
{
this
.
setColorTheme
(
DEFAULT_THEME_ID
,
'
auto
'
);
}
if
(
this
.
currentColorTheme
.
id
===
DEFAULT_THEME_ID
&&
!
types
.
isUndefined
(
prevColorId
)
&&
await
this
.
colorThemeStore
.
findThemeData
(
prevColorId
))
{
// restore color
this
.
setColorTheme
(
prevColorId
,
'
auto
'
);
prevColorId
=
undefined
;
}
}
}
...
...
@@ -194,17 +193,16 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
configurationRegistry
.
notifyConfigurationSchemaUpdated
(
themeSettingsConfiguration
);
if
(
this
.
currentIconTheme
.
isLoaded
)
{
if
(
event
.
added
.
length
>
0
&&
event
.
added
.
length
<
event
.
themes
.
length
)
{
const
theme
=
await
this
.
iconThemeStore
.
findThemeData
(
this
.
currentIconTheme
.
id
);
if
(
!
theme
)
{
// current theme is no longer available
prevFileIconId
=
this
.
currentIconTheme
.
id
;
this
.
setFileIconTheme
(
event
.
added
[
0
].
id
,
'
auto
'
);
this
.
setFileIconTheme
(
DEFAULT_ICON_THEME_SETTING_VALUE
,
'
auto
'
);
}
else
{
const
theme
=
await
this
.
iconThemeStore
.
findThemeData
(
this
.
currentIconTheme
.
id
);
if
(
!
theme
)
{
if
(
prevFileIconId
&&
await
this
.
iconThemeStore
.
findThemeData
(
prevFileIconId
))
{
this
.
setFileIconTheme
(
prevFileIconId
,
'
auto
'
);
}
else
{
this
.
setFileIconTheme
(
DEFAULT_ICON_THEME_SETTING_VALUE
,
'
auto
'
);
}
// restore color
if
(
this
.
currentIconTheme
.
id
===
DEFAULT_ICON_THEME_SETTING_VALUE
&&
!
types
.
isUndefined
(
prevFileIconId
)
&&
await
this
.
iconThemeStore
.
findThemeData
(
prevFileIconId
))
{
this
.
setFileIconTheme
(
prevFileIconId
,
'
auto
'
);
prevFileIconId
=
undefined
;
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录