Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
11a262ea
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,发现更多精彩内容 >>
提交
11a262ea
编写于
3月 13, 2018
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix #28974
上级
a15c15d9
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
28 addition
and
43 deletion
+28
-43
src/vs/workbench/browser/parts/views/customView.ts
src/vs/workbench/browser/parts/views/customView.ts
+23
-41
src/vs/workbench/browser/parts/views/media/views.css
src/vs/workbench/browser/parts/views/media/views.css
+5
-2
未找到文件。
src/vs/workbench/browser/parts/views/customView.ts
浏览文件 @
11a262ea
...
...
@@ -406,7 +406,7 @@ class TreeRenderer implements IRenderer {
templateData
.
actionBar
.
context
=
(
<
TreeViewItemHandleArg
>
{
$treeViewId
:
this
.
treeViewId
,
$treeItemHandle
:
node
.
handle
});
templateData
.
actionBar
.
push
(
this
.
menus
.
getResourceActions
(
node
),
{
icon
:
true
,
label
:
false
});
templateData
.
aligner
.
align
(
node
)
;
templateData
.
aligner
.
treeItem
=
node
;
}
private
getFileKind
(
node
:
ITreeItem
):
FileKind
{
...
...
@@ -430,7 +430,7 @@ class TreeRenderer implements IRenderer {
class
Aligner
extends
Disposable
{
private
node
:
ITreeItem
;
private
_treeItem
:
ITreeItem
;
constructor
(
private
container
:
HTMLElement
,
...
...
@@ -438,65 +438,47 @@ class Aligner extends Disposable {
private
themeService
:
IWorkbenchThemeService
)
{
super
();
this
.
_register
(
this
.
themeService
.
onDidFileIconThemeChange
(()
=>
this
.
alignByTheme
()));
this
.
_register
(
this
.
themeService
.
onDidFileIconThemeChange
(()
=>
this
.
render
()));
}
align
(
treeItem
:
ITreeItem
):
void
{
this
.
node
=
treeItem
;
this
.
alignByTheme
();
set
treeItem
(
treeItem
:
ITreeItem
)
{
this
.
_treeItem
=
treeItem
;
this
.
render
();
}
private
alignByTheme
():
void
{
if
(
this
.
node
)
{
DOM
.
toggleClass
(
this
.
container
,
'
align-
with-twisty
'
,
this
.
hasToAlig
nWithTwisty
());
private
render
():
void
{
if
(
this
.
_treeItem
)
{
DOM
.
toggleClass
(
this
.
container
,
'
align-
icon-with-twisty
'
,
this
.
hasToAlignIco
nWithTwisty
());
}
}
private
hasToAlignWithTwisty
():
boolean
{
if
(
this
.
hasParentHasIcon
()
)
{
private
hasToAlign
Icon
WithTwisty
():
boolean
{
if
(
this
.
_treeItem
.
collapsibleState
!==
TreeItemCollapsibleState
.
None
)
{
return
false
;
}
const
fileIconTheme
=
this
.
themeService
.
getFileIconTheme
();
if
(
!
(
fileIconTheme
.
hasFileIcons
&&
!
fileIconTheme
.
hasFolderIcons
))
{
return
false
;
}
if
(
this
.
node
.
collapsibleState
!==
TreeItemCollapsibleState
.
None
)
{
if
(
!
this
.
hasIcon
(
this
.
_treeItem
))
{
return
false
;
}
const
icon
=
this
.
themeService
.
getTheme
().
type
===
LIGHT
?
this
.
node
.
icon
:
this
.
node
.
iconDark
;
const
hasIcon
=
!!
icon
||
!!
this
.
node
.
resourceUri
;
if
(
!
hasIcon
)
{
return
false
;
}
const
siblingsWithChildren
=
this
.
getSiblings
().
filter
(
s
=>
s
.
collapsibleState
!==
TreeItemCollapsibleState
.
None
);
for
(
const
s
of
siblingsWithChildren
)
{
const
icon
=
this
.
themeService
.
getTheme
().
type
===
LIGHT
?
s
.
icon
:
s
.
iconDark
;
if
(
icon
)
{
return
false
;
}
}
return
true
;
const
parent
:
ITreeItem
=
this
.
tree
.
getNavigator
(
this
.
_treeItem
).
parent
()
||
this
.
tree
.
getInput
();
if
(
this
.
hasIcon
(
parent
))
{
return
false
;
}
private
getSiblings
():
ITreeItem
[]
{
const
parent
:
ITreeItem
=
this
.
tree
.
getNavigator
(
this
.
node
).
parent
()
||
this
.
tree
.
getInput
();
return
parent
.
children
;
return
parent
.
children
.
every
(
c
=>
c
.
collapsibleState
===
TreeItemCollapsibleState
.
None
||
!
this
.
hasIcon
(
c
));
}
private
hasParentHasIcon
():
boolean
{
const
parent
=
this
.
tree
.
getNavigator
(
this
.
node
).
parent
()
||
this
.
tree
.
getInput
();
const
icon
=
this
.
themeService
.
getTheme
().
type
===
LIGHT
?
parent
.
icon
:
parent
.
iconDark
;
private
hasIcon
(
node
:
ITreeItem
):
boolean
{
const
icon
=
this
.
themeService
.
getTheme
().
type
===
LIGHT
?
node
.
icon
:
node
.
iconDark
;
if
(
icon
)
{
return
true
;
}
if
(
parent
.
resourceUri
)
{
if
(
node
.
resourceUri
||
node
.
themeIcon
)
{
const
fileIconTheme
=
this
.
themeService
.
getFileIconTheme
();
if
(
fileIconTheme
.
hasFileIcons
&&
fileIconTheme
.
hasFolderIcons
)
{
return
true
;
const
isFolder
=
node
.
themeIcon
?
node
.
themeIcon
.
id
===
FolderThemeIcon
.
id
:
node
.
collapsibleState
!==
TreeItemCollapsibleState
.
None
;
if
(
isFolder
)
{
return
fileIconTheme
.
hasFileIcons
&&
fileIconTheme
.
hasFolderIcons
;
}
return
fileIconTheme
.
hasFileIcons
;
}
return
false
;
}
...
...
src/vs/workbench/browser/parts/views/media/views.css
浏览文件 @
11a262ea
...
...
@@ -50,8 +50,11 @@
display
:
none
;
}
.tree-explorer-viewlet-tree-view.file-icon-themable-tree.align-icons-and-twisties
.monaco-tree-row
:not
(
.has-children
)
.content
:not
(
.align-with-twisty
)
::before
,
.tree-explorer-viewlet-tree-view.file-icon-themable-tree.hide-arrows
.monaco-tree-row
.content
::before
{
.tree-explorer-viewlet-tree-view.file-icon-themable-tree
.monaco-tree-row
.content.align-icon-with-twisty
::before
{
display
:
none
;
}
.tree-explorer-viewlet-tree-view.file-icon-themable-tree
.monaco-tree-row
.content
:not
(
.align-icon-with-twisty
)
::before
{
display
:
inline-block
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录