Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
03b1459e
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,发现更多精彩内容 >>
提交
03b1459e
编写于
2月 20, 2017
作者:
M
Martin Aeschlimann
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Theme: theme change no longer applied to settings. Fixes #20877
上级
a15e34f7
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
5 addition
and
5 deletion
+5
-5
src/vs/workbench/services/themes/electron-browser/themeService.ts
...orkbench/services/themes/electron-browser/themeService.ts
+5
-5
未找到文件。
src/vs/workbench/services/themes/electron-browser/themeService.ts
浏览文件 @
03b1459e
...
@@ -368,7 +368,7 @@ export class ThemeService implements IThemeService {
...
@@ -368,7 +368,7 @@ export class ThemeService implements IThemeService {
return
TPromise
.
as
(
null
);
return
TPromise
.
as
(
null
);
}
}
if
(
themeId
===
this
.
currentColorTheme
.
id
&&
this
.
currentColorTheme
.
isLoaded
)
{
if
(
themeId
===
this
.
currentColorTheme
.
id
&&
this
.
currentColorTheme
.
isLoaded
)
{
return
TPromise
.
as
(
this
.
currentColorTheme
);
return
this
.
writeColorThemeConfiguration
(
settingsTarget
);
}
}
themeId
=
validateThemeId
(
themeId
);
// migrate theme ids
themeId
=
validateThemeId
(
themeId
);
// migrate theme ids
...
@@ -403,8 +403,8 @@ export class ThemeService implements IThemeService {
...
@@ -403,8 +403,8 @@ export class ThemeService implements IThemeService {
}
}
private
writeColorThemeConfiguration
(
settingsTarget
:
ConfigurationTarget
)
{
private
writeColorThemeConfiguration
(
settingsTarget
:
ConfigurationTarget
)
{
if
(
!
types
.
isUndefinedOrNull
(
settingsTarget
))
{
let
value
=
this
.
currentColorTheme
.
settingsId
;
let
value
=
this
.
currentColorTheme
.
settingsId
;
if
(
!
types
.
isUndefinedOrNull
(
settingsTarget
)
&&
this
.
configurationService
.
lookup
(
COLOR_THEME_SETTING
).
value
!==
value
)
{
if
(
settingsTarget
===
ConfigurationTarget
.
USER
&&
this
.
currentColorTheme
.
id
===
DEFAULT_THEME_ID
)
{
if
(
settingsTarget
===
ConfigurationTarget
.
USER
&&
this
.
currentColorTheme
.
id
===
DEFAULT_THEME_ID
)
{
value
=
void
0
;
// remove key from user settings
value
=
void
0
;
// remove key from user settings
}
}
...
@@ -606,8 +606,8 @@ export class ThemeService implements IThemeService {
...
@@ -606,8 +606,8 @@ export class ThemeService implements IThemeService {
}
}
private
writeFileIconConfiguration
(
settingsTarget
:
ConfigurationTarget
):
TPromise
<
IFileIconTheme
>
{
private
writeFileIconConfiguration
(
settingsTarget
:
ConfigurationTarget
):
TPromise
<
IFileIconTheme
>
{
if
(
!
types
.
isUndefinedOrNull
(
settingsTarget
))
{
let
value
=
this
.
currentIconTheme
.
settingsId
;
let
value
=
this
.
currentIconTheme
.
settingsId
;
if
(
!
types
.
isUndefinedOrNull
(
settingsTarget
)
&&
this
.
configurationService
.
lookup
(
ICON_THEME_SETTING
).
value
!==
value
)
{
if
(
settingsTarget
===
ConfigurationTarget
.
USER
&&
this
.
currentIconTheme
.
id
===
''
)
{
if
(
settingsTarget
===
ConfigurationTarget
.
USER
&&
this
.
currentIconTheme
.
id
===
''
)
{
value
=
void
0
;
// remove key from user settings
value
=
void
0
;
// remove key from user settings
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录