Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
1a7d482b
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,发现更多精彩内容 >>
提交
1a7d482b
编写于
3月 17, 2017
作者:
M
Martin Aeschlimann
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[themes] check if persisted theme matches the loaded theme
上级
7749f542
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
13 addition
and
4 deletion
+13
-4
src/vs/workbench/services/themes/electron-browser/colorThemeData.ts
...kbench/services/themes/electron-browser/colorThemeData.ts
+5
-1
src/vs/workbench/services/themes/electron-browser/themeService.ts
...orkbench/services/themes/electron-browser/themeService.ts
+8
-3
未找到文件。
src/vs/workbench/services/themes/electron-browser/colorThemeData.ts
浏览文件 @
1a7d482b
...
...
@@ -12,6 +12,7 @@ import { TPromise } from 'vs/base/common/winjs.base';
import
{
getBaseThemeId
,
getSyntaxThemeId
,
isDarkTheme
,
isLightTheme
}
from
'
vs/platform/theme/common/themes
'
;
import
nls
=
require
(
'
vs/nls
'
);
import
*
as
types
from
'
vs/base/common/types
'
;
import
*
as
objects
from
'
vs/base/common/objects
'
;
import
*
as
plist
from
'
fast-plist
'
;
import
pfs
=
require
(
'
vs/base/node/pfs
'
);
...
...
@@ -99,12 +100,15 @@ export class ColorThemeData implements IColorTheme {
settingsId
:
this
.
settingsId
,
selector
:
this
.
selector
,
tokenColors
:
this
.
tokenColors
,
isLoaded
:
true
,
extensionData
:
this
.
extensionData
,
colorMap
:
colorMapData
});
}
hasEqualData
(
other
:
ColorThemeData
)
{
return
objects
.
equals
(
this
.
colorMap
,
other
.
colorMap
)
&&
objects
.
equals
(
this
.
tokenColors
,
other
.
tokenColors
);
}
get
type
():
ThemeType
{
switch
(
this
.
getBaseThemeId
())
{
case
VS_LIGHT_THEME
:
return
'
light
'
;
...
...
src/vs/workbench/services/themes/electron-browser/themeService.ts
浏览文件 @
1a7d482b
...
...
@@ -181,7 +181,7 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
_serviceBrand
:
any
;
private
knownColorThemes
:
ColorThemeData
[];
private
currentColorTheme
:
IColorTheme
;
private
currentColorTheme
:
ColorThemeData
;
private
container
:
HTMLElement
;
private
onColorThemeChange
:
Emitter
<
IColorTheme
>
;
...
...
@@ -392,6 +392,11 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
return
this
.
findThemeData
(
themeId
,
DEFAULT_THEME_ID
).
then
(
themeData
=>
{
if
(
themeData
)
{
return
themeData
.
ensureLoaded
().
then
(
_
=>
{
if
(
themeId
===
this
.
currentColorTheme
.
id
&&
!
this
.
currentColorTheme
.
isLoaded
&&
this
.
currentColorTheme
.
hasEqualData
(
themeData
))
{
// the loaded theme is identical to the perisisted theme. Don't need to send an event.
this
.
currentColorTheme
=
themeData
;
return
TPromise
.
as
(
themeData
);
}
this
.
updateDynamicCSSRules
(
themeData
);
return
this
.
applyTheme
(
themeData
,
settingsTarget
);
},
error
=>
{
...
...
@@ -427,12 +432,12 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
this
.
currentColorTheme
=
newTheme
;
this
.
themingParticipantChangeListener
=
themingRegistry
.
onThemingParticipantAdded
(
p
=>
this
.
updateDynamicCSSRules
(
this
.
currentColorTheme
));
this
.
sendTelemetry
(
newTheme
.
id
,
newTheme
.
extensionData
,
'
color
'
);
if
(
silent
)
{
return
TPromise
.
as
(
null
);
}
this
.
sendTelemetry
(
newTheme
.
id
,
newTheme
.
extensionData
,
'
color
'
);
this
.
onColorThemeChange
.
fire
(
this
.
currentColorTheme
);
if
(
settingsTarget
!==
ConfigurationTarget
.
WORKSPACE
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录