Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
66efeebc
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,发现更多精彩内容 >>
提交
66efeebc
编写于
4月 21, 2020
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
💄
上级
4a7dc991
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
20 addition
and
32 deletion
+20
-32
src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
...vs/workbench/browser/parts/activitybar/activitybarPart.ts
+6
-6
src/vs/workbench/browser/parts/panel/panelPart.ts
src/vs/workbench/browser/parts/panel/panelPart.ts
+14
-26
未找到文件。
src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
浏览文件 @
66efeebc
...
...
@@ -478,11 +478,11 @@ export class ActivitybarPart extends Part implements IActivityBarService {
for
(
const
viewlet
of
viewlets
)
{
const
viewContainer
=
this
.
getViewContainer
(
viewlet
.
id
)
!
;
const
viewContainerModel
=
this
.
viewDescriptorService
.
getViewContainerModel
(
viewContainer
);
this
.
updateActivity
(
view
let
,
viewContainerModel
);
this
.
updateActivity
(
view
Container
,
viewContainerModel
);
this
.
onDidChangeActiveViews
(
viewContainer
,
viewContainerModel
);
const
disposables
=
new
DisposableStore
();
disposables
.
add
(
viewContainerModel
.
onDidChangeContainerInfo
(()
=>
this
.
updateActivity
(
view
let
,
viewContainerModel
)));
disposables
.
add
(
viewContainerModel
.
onDidChangeContainerInfo
(()
=>
this
.
updateActivity
(
view
Container
,
viewContainerModel
)));
disposables
.
add
(
viewContainerModel
.
onDidChangeActiveViewDescriptors
(()
=>
this
.
onDidChangeActiveViews
(
viewContainer
,
viewContainerModel
)));
this
.
viewletDisposables
.
set
(
viewlet
.
id
,
disposables
);
...
...
@@ -499,17 +499,17 @@ export class ActivitybarPart extends Part implements IActivityBarService {
this
.
hideComposite
(
viewletId
);
}
private
updateActivity
(
view
let
:
ViewletDescripto
r
,
viewContainerModel
:
IViewContainerModel
):
void
{
private
updateActivity
(
view
Container
:
ViewContaine
r
,
viewContainerModel
:
IViewContainerModel
):
void
{
const
activity
:
IActivity
=
{
id
:
view
let
.
id
,
id
:
view
Container
.
id
,
name
:
viewContainerModel
.
title
,
iconUrl
:
URI
.
isUri
(
viewContainerModel
.
icon
)
?
viewContainerModel
.
icon
:
undefined
,
cssClass
:
isString
(
viewContainerModel
.
icon
)
?
viewContainerModel
.
icon
:
undefined
,
keybindingId
:
view
let
.
keybindingI
d
keybindingId
:
view
Container
.
focusCommand
?.
id
||
viewContainer
.
i
d
};
const
{
activityAction
,
pinnedAction
}
=
this
.
getCompositeActions
(
view
let
.
id
);
const
{
activityAction
,
pinnedAction
}
=
this
.
getCompositeActions
(
view
Container
.
id
);
activityAction
.
setActivity
(
activity
);
if
(
pinnedAction
instanceof
PlaceHolderToggleCompositePinnedAction
)
{
...
...
src/vs/workbench/browser/parts/panel/panelPart.ts
浏览文件 @
66efeebc
...
...
@@ -209,14 +209,14 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
}
for
(
const
panel
of
panels
)
{
this
.
enableCompositeActions
(
panel
);
const
viewContainer
=
this
.
getViewContainer
(
panel
.
id
)
!
;
const
viewContainerModel
=
this
.
viewDescriptorService
.
getViewContainerModel
(
viewContainer
);
this
.
onDidChangeActiveViews
(
panel
,
viewContainerModel
,
viewContainer
.
hideIfEmpty
);
this
.
updateActivity
(
viewContainer
,
viewContainerModel
);
this
.
onDidChangeActiveViews
(
viewContainer
,
viewContainerModel
);
const
disposables
=
new
DisposableStore
();
disposables
.
add
(
viewContainerModel
.
onDidChangeActiveViewDescriptors
(()
=>
this
.
onDidChangeActiveViews
(
panel
,
viewContainerModel
,
viewContainer
.
hideIfEmpty
)));
disposables
.
add
(
viewContainerModel
.
onDidChangeContainerInfo
(()
=>
this
.
onDidUpdateViews
(
panel
,
viewContainerModel
)));
disposables
.
add
(
viewContainerModel
.
onDidChangeActiveViewDescriptors
(()
=>
this
.
onDidChangeActiveViews
(
viewContainer
,
viewContainerModel
)));
disposables
.
add
(
viewContainerModel
.
onDidChangeContainerInfo
(()
=>
this
.
updateActivity
(
viewContainer
,
viewContainerModel
)));
this
.
panelDisposables
.
set
(
panel
.
id
,
disposables
);
}
...
...
@@ -232,40 +232,28 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
this
.
hideComposite
(
panelId
);
}
private
enableCompositeActions
(
panel
:
PanelDescriptor
):
void
{
const
{
activityAction
,
pinnedAction
}
=
this
.
getCompositeActions
(
panel
.
id
);
activityAction
.
setActivity
(
panel
);
if
(
pinnedAction
instanceof
PlaceHolderToggleCompositePinnedAction
)
{
pinnedAction
.
setActivity
(
panel
);
}
}
private
updateActivity
(
panel
:
PanelDescriptor
,
viewContainerModel
:
IViewContainerModel
):
void
{
private
updateActivity
(
viewContainer
:
ViewContainer
,
viewContainerModel
:
IViewContainerModel
):
void
{
const
activity
:
IActivity
=
{
id
:
panel
.
id
,
id
:
viewContainer
.
id
,
name
:
viewContainerModel
.
title
,
keybindingId
:
panel
.
keybindingI
d
keybindingId
:
viewContainer
.
focusCommand
?.
i
d
};
const
{
activityAction
,
pinnedAction
}
=
this
.
getCompositeActions
(
panel
.
id
);
const
{
activityAction
,
pinnedAction
}
=
this
.
getCompositeActions
(
viewContainer
.
id
);
activityAction
.
setActivity
(
activity
);
if
(
pinnedAction
instanceof
PlaceHolderToggleCompositePinnedAction
)
{
pinnedAction
.
setActivity
(
activity
);
}
}
private
onDidUpdateViews
(
panel
:
PanelDescriptor
,
viewDescriptors
:
IViewContainerModel
):
void
{
this
.
updateActivity
(
panel
,
viewDescriptors
);
this
.
saveCachedPanels
();
}
private
onDidChangeActiveViews
(
panel
:
PanelDescriptor
,
viewDescriptors
:
IViewContainerModel
,
hideIfEmpty
?:
boolean
):
void
{
if
(
viewDescriptors
.
activeViewDescriptors
.
length
)
{
this
.
updateActivity
(
panel
,
viewDescriptors
);
this
.
compositeBar
.
addComposite
(
panel
);
}
else
if
(
hideIfEmpty
)
{
this
.
hideComposite
(
panel
.
id
);
private
onDidChangeActiveViews
(
viewContainer
:
ViewContainer
,
viewContainerModel
:
IViewContainerModel
):
void
{
if
(
viewContainerModel
.
activeViewDescriptors
.
length
)
{
this
.
compositeBar
.
addComposite
(
viewContainer
);
}
else
if
(
viewContainer
.
hideIfEmpty
)
{
this
.
hideComposite
(
viewContainer
.
id
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录