Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
e3277906
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,发现更多精彩内容 >>
提交
e3277906
编写于
6月 14, 2018
作者:
R
Rob Lourens
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Settings editor - focus tree on TOC selection
上级
d6958430
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
19 addition
and
10 deletion
+19
-10
src/vs/workbench/parts/preferences/browser/settingsEditor2.ts
...vs/workbench/parts/preferences/browser/settingsEditor2.ts
+18
-5
src/vs/workbench/parts/preferences/browser/settingsTree.ts
src/vs/workbench/parts/preferences/browser/settingsTree.ts
+1
-5
未找到文件。
src/vs/workbench/parts/preferences/browser/settingsEditor2.ts
浏览文件 @
e3277906
...
...
@@ -96,7 +96,7 @@ export class SettingsEditor2 extends BaseEditor {
this
.
inSettingsEditorContextKey
=
CONTEXT_SETTINGS_EDITOR
.
bindTo
(
contextKeyService
);
this
.
searchFocusContextKey
=
CONTEXT_SETTINGS_SEARCH_FOCUS
.
bindTo
(
contextKeyService
);
this
.
_register
(
configurationService
.
onDidChangeConfiguration
(()
=>
this
.
refreshTreeAndMaintainFocus
()));
this
.
_register
(
configurationService
.
onDidChangeConfiguration
(()
=>
this
.
onConfigUpdate
()));
}
createEditor
(
parent
:
HTMLElement
):
void
{
...
...
@@ -241,7 +241,11 @@ export class SettingsEditor2 extends BaseEditor {
this
.
_register
(
this
.
tocTree
.
onDidChangeSelection
(
e
=>
{
if
(
this
.
settingsTreeModel
)
{
const
element
=
this
.
settingsTreeModel
.
getElementById
(
e
.
selection
[
0
]
&&
e
.
selection
[
0
].
id
);
if
(
element
)
{
this
.
settingsTree
.
reveal
(
element
,
0
);
this
.
settingsTree
.
setSelection
([
element
]);
this
.
settingsTree
.
setFocus
(
element
);
}
}
}));
}
...
...
@@ -430,9 +434,7 @@ export class SettingsEditor2 extends BaseEditor {
}
this
.
defaultSettingsEditorModel
=
model
;
this
.
settingsTreeModel
=
this
.
instantiationService
.
createInstance
(
SettingsTreeModel
,
this
.
viewState
,
tocData
,
this
.
defaultSettingsEditorModel
.
settingsGroups
.
slice
(
1
));
this
.
tocTree
.
setInput
(
this
.
settingsTreeModel
.
root
);
this
.
settingsTree
.
setInput
(
this
.
settingsTreeModel
.
root
);
this
.
onConfigUpdate
();
});
}
return
TPromise
.
as
(
null
);
...
...
@@ -442,6 +444,17 @@ export class SettingsEditor2 extends BaseEditor {
DOM
.
toggleClass
(
this
.
getContainer
(),
'
search-mode
'
,
!!
this
.
searchResultModel
);
}
private
onConfigUpdate
():
TPromise
<
void
>
{
this
.
settingsTreeModel
=
this
.
instantiationService
.
createInstance
(
SettingsTreeModel
,
this
.
viewState
,
tocData
,
this
.
defaultSettingsEditorModel
.
settingsGroups
.
slice
(
1
));
if
(
!
this
.
searchResultModel
)
{
this
.
settingsTree
.
setInput
(
this
.
settingsTreeModel
.
root
);
this
.
tocTree
.
setInput
(
this
.
settingsTreeModel
.
root
);
}
return
this
.
refreshTreeAndMaintainFocus
();
}
private
refreshTreeAndMaintainFocus
():
TPromise
<
any
>
{
// Sort of a hack to maintain focus on the focused control across a refresh
const
focusedRowItem
=
DOM
.
findParentWithClass
(
<
HTMLElement
>
document
.
activeElement
,
'
setting-item
'
);
...
...
src/vs/workbench/parts/preferences/browser/settingsTree.ts
浏览文件 @
e3277906
...
...
@@ -253,17 +253,13 @@ export class SettingsDataSource implements IDataSource {
if
(
element
instanceof
SearchResultModel
)
{
return
this
.
getSearchResultChildren
(
element
);
}
else
if
(
element
instanceof
SettingsTreeGroupElement
)
{
return
this
.
getGroupChildren
(
element
)
;
return
element
.
children
;
}
else
{
// No children...
return
null
;
}
}
private
getGroupChildren
(
groupElement
:
SettingsTreeGroupElement
):
SettingsTreeElement
[]
{
return
groupElement
.
children
;
}
getParent
(
tree
:
ITree
,
element
:
SettingsTreeElement
):
TPromise
<
any
,
any
>
{
return
TPromise
.
wrap
(
element
.
parent
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录