Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
33edbc2d
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,发现更多精彩内容 >>
提交
33edbc2d
编写于
9月 20, 2018
作者:
R
Rob Lourens
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix #55795 - settings editor layout to allow scrolling in the margin to the right of the editor
上级
59498e3d
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
61 addition
and
34 deletion
+61
-34
src/vs/workbench/parts/preferences/browser/media/settingsEditor2.css
...bench/parts/preferences/browser/media/settingsEditor2.css
+57
-31
src/vs/workbench/parts/preferences/browser/settingsEditor2.ts
...vs/workbench/parts/preferences/browser/settingsEditor2.ts
+2
-1
src/vs/workbench/parts/preferences/browser/settingsTree.ts
src/vs/workbench/parts/preferences/browser/settingsTree.ts
+2
-2
未找到文件。
src/vs/workbench/parts/preferences/browser/media/settingsEditor2.css
浏览文件 @
33edbc2d
...
...
@@ -8,9 +8,7 @@
}
.settings-editor
{
padding
:
11px
24px
0px
;
max-width
:
1000px
;
margin
:
auto
;
padding
:
11px
0px
0px
;
}
/* header styling */
...
...
@@ -19,6 +17,9 @@
margin
:
auto
;
overflow
:
hidden
;
padding-top
:
3px
;
padding-left
:
24px
;
padding-right
:
24px
;
max-width
:
1000px
;
}
.settings-editor
>
.settings-header
>
.search-container
{
...
...
@@ -91,7 +92,8 @@
}
.settings-editor
>
.settings-header
>
.settings-header-controls
.settings-tabs-widget
>
.monaco-action-bar
.action-item
{
padding
:
0px
;
/* padding must be on action-label because it has the bottom-border, because that's where the .checked class is */
padding
:
0px
;
/* padding must be on action-label because it has the bottom-border, because that's where the .checked class is */
}
.settings-editor
>
.settings-header
>
.settings-header-controls
.settings-tabs-widget
>
.monaco-action-bar
.action-item
.action-label
{
...
...
@@ -104,12 +106,6 @@
padding-right
:
8px
;
}
.settings-editor
>
.settings-body
{
display
:
flex
;
margin
:
auto
;
max-width
:
1000px
;
}
.settings-editor
>
.settings-body
>
.no-results
{
margin-top
:
20px
;
display
:
none
;
...
...
@@ -126,10 +122,27 @@
margin-left
:
0px
;
}
.settings-editor
>
.settings-body
.settings-tree-container
.monaco-tree-wrapper
{
max-width
:
1000px
;
margin
:
auto
;
}
.settings-editor
>
.settings-body
.settings-tree-container
.monaco-tree-wrapper
.monaco-tree-rows
{
margin-left
:
208px
;
width
:
calc
(
100%
-
208px
);
}
.settings-editor.no-toc-search
>
.settings-body
.settings-tree-container
.monaco-tree-wrapper
.monaco-tree-rows
,
.settings-editor.narrow
>
.settings-body
.settings-tree-container
.monaco-tree-wrapper
.monaco-tree-rows
{
/* 3 margin + 20 padding + 2 border */
width
:
calc
(
100%
-
25px
);
margin-left
:
25px
;
}
.settings-editor
>
.settings-body
>
.settings-tree-container
.setting-measure-container
{
/* 20
from monaco-tree-row
*/
padding-left
:
2
0px
;
width
:
calc
(
100%
-
33
px
);
/* 20
8 margin + 20 padding + 2 border
*/
margin-left
:
23
0px
;
width
:
calc
(
100%
-
230
px
);
border
:
1px
solid
transparent
;
}
...
...
@@ -138,20 +151,14 @@
display
:
none
!important
;
}
.settings-editor
>
.settings-body
>
.settings-tree-container
.shadow.top
:not
(
.top-left-corner
)
{
position
:
absolute
;
left
:
-160px
;
/* toc width */
right
:
0px
;
width
:
initial
;
}
.settings-editor
>
.settings-body
>
.settings-tree-container
>
.monaco-tree
.shadow.top.top-left-corner
{
position
:
absolute
;
left
:
-160px
;
.settings-editor
>
.settings-body
>
.settings-tree-container
.shadow.top
{
max-width
:
1000px
;
margin
:
auto
;
}
.settings-editor
>
.settings-body
>
.settings-tree-container
>
.monaco-tree
.monaco-scrollable-element
{
overflow
:
visible
!important
;
/* so the shadow can be drawn outside the scrollable element */
overflow
:
visible
!important
;
/* so the shadow can be drawn outside the scrollable element */
}
.settings-editor
>
.settings-body
.settings-tree-container
.setting-toolbar-container
{
...
...
@@ -192,8 +199,15 @@
}
.settings-editor
>
.settings-body
.settings-toc-container
{
width
:
100%
;
pointer-events
:
none
;
z-index
:
100
;
position
:
absolute
;
}
.settings-editor
>
.settings-body
.settings-toc-container
.monaco-tree
{
width
:
160px
;
margin-top
:
16px
;
pointer-events
:
initial
;
}
.settings-editor.no-toc-search
>
.settings-body
.settings-toc-container
,
...
...
@@ -246,22 +260,33 @@
}
.settings-editor
>
.settings-body
.settings-tree-container
{
flex
:
1
;
margin-right
:
1px
;
/* So the item doesn't blend into the edge of the view container */
margin-left
:
20px
;
margin-right
:
1px
;
/* So the item doesn't blend into the edge of the view container */
margin-top
:
14px
;
border-spacing
:
0
;
border-collapse
:
separate
;
position
:
relative
;
}
.settings-editor
>
.settings-body
.settings-toc-wrapper
{
padding-left
:
31px
;
}
.settings-editor
>
.settings-body
.settings-tree-container
.monaco-tree-wrapper
,
.settings-editor
>
.settings-body
.settings-toc-wrapper
{
height
:
100%
;
max-width
:
1000px
;
margin
:
auto
;
}
.settings-editor.no-toc-search
>
.settings-body
.settings-tree-container
,
.settings-editor.narrow
>
.settings-body
.settings-tree-container
{
margin-left
:
0px
;
}
.settings-editor
>
.settings-body
>
.settings-tree-container
.monaco-tree-row
{
overflow
:
visible
;
/* so validation messages dont get clipped */
overflow
:
visible
;
/* so validation messages dont get clipped */
cursor
:
default
;
}
...
...
@@ -374,7 +399,8 @@
}
.settings-editor
>
.settings-body
>
.settings-tree-container
.setting-item
.setting-item-description-markdown
code
{
line-height
:
15px
;
/** For some reason, this is needed, otherwise <code> will take up 20px height */
line-height
:
15px
;
/** For some reason, this is needed, otherwise <code> will take up 20px height */
font-family
:
Menlo
,
Monaco
,
Consolas
,
"Droid Sans Mono"
,
"Courier New"
,
monospace
,
"Droid Sans Fallback"
;
}
...
...
@@ -500,4 +526,4 @@
.settings-editor.search-mode
>
.settings-body
.settings-toc-container
.monaco-tree-row
.settings-toc-count
{
display
:
block
;
}
}
\ No newline at end of file
src/vs/workbench/parts/preferences/browser/settingsEditor2.ts
浏览文件 @
33edbc2d
...
...
@@ -498,7 +498,8 @@ export class SettingsEditor2 extends BaseEditor {
const
tocRenderer
=
this
.
instantiationService
.
createInstance
(
TOCRenderer
);
this
.
tocTree
=
this
.
_register
(
this
.
instantiationService
.
createInstance
(
TOCTree
,
this
.
tocTreeContainer
,
this
.
tocTree
=
this
.
_register
(
this
.
instantiationService
.
createInstance
(
TOCTree
,
DOM
.
append
(
this
.
tocTreeContainer
,
$
(
'
.settings-toc-wrapper
'
)),
this
.
viewState
,
{
renderer
:
tocRenderer
...
...
src/vs/workbench/parts/preferences/browser/settingsTree.ts
浏览文件 @
33edbc2d
...
...
@@ -366,7 +366,7 @@ export class SettingsRenderer implements ITreeRenderer {
private
settingActions
:
IAction
[];
constructor
(
_measure
Container
:
HTMLElement
,
_measure
Parent
:
HTMLElement
,
@
IThemeService
private
themeService
:
IThemeService
,
@
IContextViewService
private
contextViewService
:
IContextViewService
,
@
IOpenerService
private
readonly
openerService
:
IOpenerService
,
...
...
@@ -376,7 +376,7 @@ export class SettingsRenderer implements ITreeRenderer {
@
IKeybindingService
private
keybindingService
:
IKeybindingService
,
)
{
this
.
descriptionMeasureContainer
=
$
(
'
.setting-item-description
'
);
DOM
.
append
(
_measure
Container
,
DOM
.
append
(
_measure
Parent
,
$
(
'
.setting-measure-container.monaco-tree-row
'
,
undefined
,
$
(
'
.setting-item
'
,
undefined
,
this
.
descriptionMeasureContainer
)));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录