Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
5290fc4d
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,发现更多精彩内容 >>
提交
5290fc4d
编写于
5月 06, 2018
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove options from composite bar and use addComposite for adding
上级
d48541bb
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
3 addition
and
19 deletion
+3
-19
src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
...vs/workbench/browser/parts/activitybar/activitybarPart.ts
+0
-1
src/vs/workbench/browser/parts/compositebar/compositeBar.ts
src/vs/workbench/browser/parts/compositebar/compositeBar.ts
+0
-17
src/vs/workbench/browser/parts/panel/panelPart.ts
src/vs/workbench/browser/parts/panel/panelPart.ts
+3
-1
未找到文件。
src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
浏览文件 @
5290fc4d
...
...
@@ -66,7 +66,6 @@ export class ActivitybarPart extends Part {
icon
:
true
,
storageId
:
ActivitybarPart
.
PINNED_VIEWLETS
,
orientation
:
ActionsOrientation
.
VERTICAL
,
composites
:
this
.
viewletService
.
getViewlets
().
filter
(
v
=>
this
.
canShow
(
v
)),
openComposite
:
(
compositeId
:
string
)
=>
this
.
viewletService
.
openViewlet
(
compositeId
,
true
),
getActivityAction
:
(
compositeId
:
string
)
=>
this
.
getCompositeActions
(
compositeId
).
activityAction
,
getCompositePinnedAction
:
(
compositeId
:
string
)
=>
this
.
getCompositeActions
(
compositeId
).
pinnedAction
,
...
...
src/vs/workbench/browser/parts/compositebar/compositeBar.ts
浏览文件 @
5290fc4d
...
...
@@ -25,7 +25,6 @@ export interface ICompositeBarOptions {
icon
:
boolean
;
storageId
:
string
;
orientation
:
ActionsOrientation
;
composites
:
{
id
:
string
,
name
:
string
,
order
:
number
}[];
colors
:
ICompositeBarColors
;
compositeSize
:
number
;
overflowActionSize
:
number
;
...
...
@@ -62,14 +61,6 @@ export class CompositeBar extends Widget implements ICompositeBar {
this
.
storedState
=
this
.
loadCompositeItemsFromStorage
();
this
.
visibleComposites
=
[];
this
.
compositeSizeInBar
=
new
Map
<
string
,
number
>
();
let
index
=
0
;
for
(
const
state
of
this
.
storedState
)
{
const
composite
=
this
.
options
.
composites
.
filter
(
c
=>
c
.
id
===
state
.
id
)[
0
];
if
(
composite
)
{
this
.
addToModel
(
composite
.
id
,
composite
.
name
,
composite
.
order
,
state
.
pinned
,
index
++
);
}
}
}
public
create
(
parent
:
HTMLElement
):
HTMLElement
{
...
...
@@ -449,16 +440,8 @@ export class CompositeBar extends Widget implements ICompositeBar {
private
loadCompositeItemsFromStorage
():
ISerializedCompositeBarItem
[]
{
const
storedStates
=
<
Array
<
string
|
ISerializedCompositeBarItem
>>
JSON
.
parse
(
this
.
storageService
.
get
(
this
.
options
.
storageId
,
StorageScope
.
GLOBAL
,
'
[]
'
));
const
isOldData
=
storedStates
&&
storedStates
.
length
&&
typeof
storedStates
[
0
]
===
'
string
'
;
const
compositeStates
=
<
ISerializedCompositeBarItem
[]
>
storedStates
.
map
(
c
=>
typeof
c
===
'
string
'
/* migration from pinned states to composites states */
?
{
id
:
c
,
pinned
:
true
}
:
c
);
if
(
!
isOldData
)
{
/* Add new composites only if it is new data */
const
newComposites
=
this
.
options
.
composites
.
filter
(
c
=>
compositeStates
.
every
(
s
=>
s
.
id
!==
c
.
id
));
newComposites
.
sort
((
c1
,
c2
)
=>
c1
.
order
<
c2
.
order
?
-
1
:
1
);
newComposites
.
forEach
(
c
=>
compositeStates
.
push
({
id
:
c
.
id
,
pinned
:
true
,
order
:
c
.
order
/* new composites are pinned by default */
}));
}
return
compositeStates
;
}
...
...
src/vs/workbench/browser/parts/panel/panelPart.ts
浏览文件 @
5290fc4d
...
...
@@ -80,7 +80,6 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
icon
:
false
,
storageId
:
PanelPart
.
PINNED_PANELS
,
orientation
:
ActionsOrientation
.
HORIZONTAL
,
composites
:
this
.
getPanels
(),
openComposite
:
(
compositeId
:
string
)
=>
this
.
openPanel
(
compositeId
,
true
),
getActivityAction
:
(
compositeId
:
string
)
=>
this
.
getCompositeActions
(
compositeId
).
activityAction
,
getCompositePinnedAction
:
(
compositeId
:
string
)
=>
this
.
getCompositeActions
(
compositeId
).
pinnedAction
,
...
...
@@ -98,6 +97,9 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
}
});
this
.
toUnbind
.
push
(
this
.
compositeBar
);
for
(
const
panel
of
this
.
getPanels
())
{
this
.
compositeBar
.
addComposite
(
panel
,
false
);
}
this
.
registerListeners
();
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录