Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
徽霖
Vscode
提交
e929a1cb
V
Vscode
项目概览
徽霖
/
Vscode
通知
9
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,发现更多精彩内容 >>
提交
e929a1cb
编写于
3月 08, 2018
作者:
I
isidor
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
composite bar: respect order of composites when adding
fixes #44306
上级
cb845480
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
11 addition
and
8 deletion
+11
-8
src/vs/workbench/browser/parts/compositebar/compositeBar.ts
src/vs/workbench/browser/parts/compositebar/compositeBar.ts
+9
-6
src/vs/workbench/browser/parts/panel/panelPart.ts
src/vs/workbench/browser/parts/panel/panelPart.ts
+2
-2
未找到文件。
src/vs/workbench/browser/parts/compositebar/compositeBar.ts
浏览文件 @
e929a1cb
...
...
@@ -24,7 +24,7 @@ export interface ICompositeBarOptions {
icon
:
boolean
;
storageId
:
string
;
orientation
:
ActionsOrientation
;
composites
:
{
id
:
string
,
name
:
string
}[];
composites
:
{
id
:
string
,
name
:
string
,
order
:
number
}[];
colors
:
ICompositeBarColors
;
overflowActionSize
:
number
;
getActivityAction
:
(
compositeId
:
string
)
=>
ActivityAction
;
...
...
@@ -81,13 +81,16 @@ export class CompositeBar implements ICompositeBar {
return
this
.
_onDidContextMenu
.
event
;
}
public
addComposite
(
compositeData
:
{
id
:
string
;
name
:
string
}):
void
{
public
addComposite
(
compositeData
:
{
id
:
string
;
name
:
string
,
order
:
number
}):
void
{
if
(
this
.
options
.
composites
.
filter
(
c
=>
c
.
id
===
compositeData
.
id
).
length
)
{
return
;
}
let
i
=
0
;
while
(
i
<
this
.
options
.
composites
.
length
&&
this
.
options
.
composites
[
i
].
order
<
compositeData
.
order
)
{
i
++
;
}
this
.
options
.
composites
.
push
(
compositeData
);
this
.
pin
(
compositeData
.
id
);
this
.
pin
(
compositeData
.
id
,
true
,
i
);
}
public
removeComposite
(
id
:
string
):
void
{
...
...
@@ -431,13 +434,13 @@ export class CompositeBar implements ICompositeBar {
return
this
.
pinnedComposites
.
indexOf
(
compositeId
)
>=
0
;
}
public
pin
(
compositeId
:
string
,
update
=
true
):
void
{
public
pin
(
compositeId
:
string
,
update
=
true
,
index
=
this
.
pinnedComposites
.
length
):
void
{
if
(
this
.
isPinned
(
compositeId
))
{
return
;
}
this
.
options
.
openComposite
(
compositeId
).
then
(()
=>
{
this
.
pinnedComposites
.
push
(
compositeId
);
this
.
pinnedComposites
.
splice
(
index
,
0
,
compositeId
);
this
.
pinnedComposites
=
arrays
.
distinct
(
this
.
pinnedComposites
);
if
(
update
)
{
...
...
src/vs/workbench/browser/parts/panel/panelPart.ts
浏览文件 @
e929a1cb
...
...
@@ -12,7 +12,7 @@ import { Registry } from 'vs/platform/registry/common/platform';
import
{
ActionsOrientation
}
from
'
vs/base/browser/ui/actionbar/actionbar
'
;
import
{
IPanel
}
from
'
vs/workbench/common/panel
'
;
import
{
CompositePart
,
ICompositeTitleLabel
}
from
'
vs/workbench/browser/parts/compositePart
'
;
import
{
Panel
,
PanelRegistry
,
Extensions
as
PanelExtensions
}
from
'
vs/workbench/browser/panel
'
;
import
{
Panel
,
PanelRegistry
,
Extensions
as
PanelExtensions
,
PanelDescriptor
}
from
'
vs/workbench/browser/panel
'
;
import
{
IPanelService
,
IPanelIdentifier
}
from
'
vs/workbench/services/panel/common/panelService
'
;
import
{
IPartService
,
Parts
,
Position
}
from
'
vs/workbench/services/part/common/partService
'
;
import
{
IStorageService
}
from
'
vs/platform/storage/common/storage
'
;
...
...
@@ -169,7 +169,7 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
});
}
public
getPanels
():
IPanelIdentifie
r
[]
{
public
getPanels
():
PanelDescripto
r
[]
{
return
Registry
.
as
<
PanelRegistry
>
(
PanelExtensions
.
Panels
).
getPanels
()
.
filter
(
p
=>
p
.
enabled
)
.
sort
((
v1
,
v2
)
=>
v1
.
order
-
v2
.
order
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录