Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
a5bfda03
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,发现更多精彩内容 >>
提交
a5bfda03
编写于
6月 22, 2018
作者:
R
Rob Lourens
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Settings editor -
💄
上级
eaec01e0
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
14 addition
and
28 deletion
+14
-28
src/vs/workbench/parts/preferences/browser/media/settingsEditor2.css
...bench/parts/preferences/browser/media/settingsEditor2.css
+8
-14
src/vs/workbench/parts/preferences/browser/settingsEditor2.ts
...vs/workbench/parts/preferences/browser/settingsEditor2.ts
+2
-12
src/vs/workbench/parts/preferences/browser/settingsTree.ts
src/vs/workbench/parts/preferences/browser/settingsTree.ts
+2
-1
src/vs/workbench/parts/preferences/browser/tocTree.ts
src/vs/workbench/parts/preferences/browser/tocTree.ts
+2
-1
未找到文件。
src/vs/workbench/parts/preferences/browser/media/settingsEditor2.css
浏览文件 @
a5bfda03
...
@@ -147,16 +147,10 @@
...
@@ -147,16 +147,10 @@
height
:
100%
;
height
:
100%
;
}
}
.settings-editor
>
.settings-body
>
.settings-tree-container
.setting-item.odd
:not
(
.focused
)
:not
(
.selected
)
:not
(
:hover
),
.settings-editor
>
.settings-body
>
.settings-tree-container
.setting-item
.setting-item-title
{
.settings-editor
>
.settings-body
>
.settings-tree-container
.monaco-tree
:not
(
:focus
)
.setting-item.focused.odd
:not
(
.selected
)
:not
(
:hover
),
white-space
:
nowrap
;
.settings-editor
>
.settings-body
>
.settings-tree-container
.monaco-tree
:not
(
.focused
)
.setting-item.focused.odd
:not
(
.selected
)
:not
(
:hover
)
{
overflow
:
hidden
;
background-color
:
rgba
(
130
,
130
,
130
,
0.04
);
text-overflow
:
ellipsis
;
}
.settings-editor
>
.settings-body
>
.settings-tree-container
.setting-item
>
.setting-item-left
{
flex
:
1
;
padding-top
:
3px
;
padding-bottom
:
12px
;
}
}
.settings-editor
>
.settings-body
>
.settings-tree-container
.setting-item
.setting-item-title
.setting-item-is-configured-label
{
.settings-editor
>
.settings-body
>
.settings-tree-container
.setting-item
.setting-item-title
.setting-item-is-configured-label
{
...
@@ -220,7 +214,7 @@
...
@@ -220,7 +214,7 @@
width
:
16px
;
width
:
16px
;
border
:
1px
solid
transparent
;
border
:
1px
solid
transparent
;
border-radius
:
3px
;
border-radius
:
3px
;
margin-right
:
3
px
;
margin-right
:
4
px
;
margin-left
:
0px
;
margin-left
:
0px
;
margin-top
:
4px
;
margin-top
:
4px
;
padding
:
0px
;
padding
:
0px
;
...
@@ -262,7 +256,7 @@
...
@@ -262,7 +256,7 @@
padding-left
:
0px
;
padding-left
:
0px
;
}
}
.settings-editor
>
.settings-body
>
.settings-tree-container
.setting-item
.setting-item-value
>
.
edit-in-settings-button
+
.setting-reset-button.monaco-button
{
.settings-editor
>
.settings-body
>
.settings-tree-container
.setting-item
.setting-item-value
>
.
setting-type-complex
+
.reset-button-container
>
.setting-reset-button.monaco-button
{
display
:
none
;
display
:
none
;
}
}
...
@@ -272,7 +266,7 @@
...
@@ -272,7 +266,7 @@
height
:
26px
;
height
:
26px
;
}
}
.settings-editor
>
.settings-body
>
.settings-tree-container
.setting-item
.setting-
item-value
>
.setting-
reset-button.monaco-button
{
.settings-editor
>
.settings-body
>
.settings-tree-container
.setting-item
.setting-reset-button.monaco-button
{
text-align
:
left
;
text-align
:
left
;
display
:
inline-block
;
display
:
inline-block
;
visibility
:
hidden
;
visibility
:
hidden
;
...
@@ -281,7 +275,7 @@
...
@@ -281,7 +275,7 @@
padding-top
:
2px
;
padding-top
:
2px
;
}
}
.settings-editor
>
.settings-body
>
.settings-tree-container
.setting-item.is-configured
.setting-
item-value
>
.setting-
reset-button.monaco-button
{
.settings-editor
>
.settings-body
>
.settings-tree-container
.setting-item.is-configured
.setting-reset-button.monaco-button
{
visibility
:
visible
;
visibility
:
visible
;
}
}
...
...
src/vs/workbench/parts/preferences/browser/settingsEditor2.ts
浏览文件 @
a5bfda03
...
@@ -250,21 +250,11 @@ export class SettingsEditor2 extends BaseEditor {
...
@@ -250,21 +250,11 @@ export class SettingsEditor2 extends BaseEditor {
this
.
refreshTreeAndMaintainFocus
();
this
.
refreshTreeAndMaintainFocus
();
}
else
if
(
this
.
settingsTreeModel
)
{
}
else
if
(
this
.
settingsTreeModel
)
{
const
element
=
e
.
selection
[
0
];
const
element
=
e
.
selection
[
0
];
const
currentSelection
=
this
.
settingsTree
.
getSelection
()[
0
];
if
(
element
&&
!
e
.
payload
.
fromScroll
)
{
const
isEqualOrParent
=
(
element
:
SettingsTreeElement
,
candidate
:
SettingsTreeElement
)
=>
{
do
{
if
(
element
===
candidate
)
{
return
true
;
}
}
while
(
element
=
element
.
parent
);
return
false
;
};
if
(
element
&&
!
e
.
payload
.
fromScroll
&&
(
!
currentSelection
||
!
isEqualOrParent
(
currentSelection
,
element
)))
{
this
.
settingsTree
.
reveal
(
element
,
0
);
this
.
settingsTree
.
reveal
(
element
,
0
);
this
.
settingsTree
.
setSelection
([
element
]);
this
.
settingsTree
.
setSelection
([
element
]);
this
.
settingsTree
.
setFocus
(
element
);
this
.
settingsTree
.
setFocus
(
element
);
this
.
settingsTree
.
domFocus
();
}
}
}
}
}));
}));
...
...
src/vs/workbench/parts/preferences/browser/settingsTree.ts
浏览文件 @
a5bfda03
...
@@ -541,7 +541,8 @@ export class SettingsRenderer implements IRenderer {
...
@@ -541,7 +541,8 @@ export class SettingsRenderer implements IRenderer {
};
};
// Prevent clicks from being handled by list
// Prevent clicks from being handled by list
toDispose
.
push
(
DOM
.
addDisposableListener
(
valueElement
,
'
mousedown
'
,
(
e
:
IMouseEvent
)
=>
e
.
stopPropagation
()));
toDispose
.
push
(
DOM
.
addDisposableListener
(
controlElement
,
'
mousedown
'
,
(
e
:
IMouseEvent
)
=>
e
.
stopPropagation
()));
toDispose
.
push
(
DOM
.
addDisposableListener
(
resetButtonElement
,
'
mousedown
'
,
(
e
:
IMouseEvent
)
=>
e
.
stopPropagation
()));
toDispose
.
push
(
DOM
.
addStandardDisposableListener
(
valueElement
,
'
keydown
'
,
(
e
:
StandardKeyboardEvent
)
=>
{
toDispose
.
push
(
DOM
.
addStandardDisposableListener
(
valueElement
,
'
keydown
'
,
(
e
:
StandardKeyboardEvent
)
=>
{
if
(
e
.
keyCode
===
KeyCode
.
Escape
)
{
if
(
e
.
keyCode
===
KeyCode
.
Escape
)
{
...
...
src/vs/workbench/parts/preferences/browser/tocTree.ts
浏览文件 @
a5bfda03
...
@@ -88,8 +88,9 @@ export class TOCDataSource implements IDataSource {
...
@@ -88,8 +88,9 @@ export class TOCDataSource implements IDataSource {
}
}
private
_getChildren
(
element
:
TOCTreeElement
):
SettingsTreeElement
[]
{
private
_getChildren
(
element
:
TOCTreeElement
):
SettingsTreeElement
[]
{
// TODO@roblou hack. Clean up or remove this option
if
(
this
.
configService
.
getValue
(
'
workbench.settings.settingsSearchTocBehavior
'
)
===
'
filter
'
)
{
if
(
this
.
configService
.
getValue
(
'
workbench.settings.settingsSearchTocBehavior
'
)
===
'
filter
'
)
{
const
children
=
element
.
children
as
SettingsTreeElement
[];
// ????
const
children
=
element
.
children
as
SettingsTreeElement
[];
//
TS
????
return
children
.
filter
(
group
=>
{
return
children
.
filter
(
group
=>
{
return
(
<
any
>
group
).
count
!==
0
;
return
(
<
any
>
group
).
count
!==
0
;
});
});
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录