Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
00bdc456
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,发现更多精彩内容 >>
提交
00bdc456
编写于
5月 22, 2018
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
grid - reduce active change events when closing last editor in group
上级
0f8ef8cb
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
28 addition
and
10 deletion
+28
-10
src/vs/workbench/browser/parts/editor/editor.ts
src/vs/workbench/browser/parts/editor/editor.ts
+1
-0
src/vs/workbench/browser/parts/editor/editorGroupView.ts
src/vs/workbench/browser/parts/editor/editorGroupView.ts
+17
-6
src/vs/workbench/browser/parts/editor/editorPart.ts
src/vs/workbench/browser/parts/editor/editorPart.ts
+10
-4
未找到文件。
src/vs/workbench/browser/parts/editor/editor.ts
浏览文件 @
00bdc456
...
...
@@ -91,6 +91,7 @@ export interface IEditorGroupsAccessor {
getGroup
(
identifier
:
GroupIdentifier
):
IEditorGroupView
;
activateGroup
(
identifier
:
IEditorGroupView
|
GroupIdentifier
):
IEditorGroupView
;
activatePreviousActiveGroup
();
addGroup
(
location
:
IEditorGroupView
|
GroupIdentifier
,
direction
:
GroupDirection
,
options
?:
IAddGroupOptions
):
IEditorGroupView
;
mergeGroup
(
group
:
IEditorGroupView
|
GroupIdentifier
,
target
:
IEditorGroupView
|
GroupIdentifier
,
options
?:
IMergeGroupOptions
):
IEditorGroupView
;
...
...
src/vs/workbench/browser/parts/editor/editorGroupView.ts
浏览文件 @
00bdc456
...
...
@@ -884,6 +884,18 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
const
editorToClose
=
this
.
activeEditor
;
const
editorHasFocus
=
isAncestor
(
document
.
activeElement
,
this
.
element
);
// Optimization: if we are about to close the last editor in this group and settings
// are configured to close the group since it will be empty, we first set the last
// active group as empty before closing the editor. This reduces the amount of editor
// change events that this operation emits and will reduce flicker. Without this
// optimization, this group (if active) would first trigger a active editor change
// event because it became empty, only to then trigger another one when the next
// group gets active.
const
closeEmptyGroup
=
this
.
accessor
.
partOptions
.
closeEmptyGroups
;
if
(
closeEmptyGroup
&&
this
.
active
&&
this
.
_group
.
count
===
1
)
{
this
.
accessor
.
activatePreviousActiveGroup
();
}
// Update model
this
.
_group
.
closeEditor
(
editorToClose
);
...
...
@@ -906,23 +918,22 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
});
}
// Otherwise clear from editor control and send event
// Otherwise
we are empty, so
clear from editor control and send event
else
{
// Forward to editor control
this
.
editorControl
.
closeEditor
(
editorToClose
);
// Restore focus to group container as needed
if
(
editorHasFocus
)
{
// Restore focus to group container as needed
unless group gets closed
if
(
editorHasFocus
&&
!
closeEmptyGroup
)
{
this
.
focus
();
}
// Events
this
.
_onDidGroupChange
.
fire
({
kind
:
GroupChangeKind
.
EDITOR_ACTIVE
});
// Check if group gets closed now
const
closeGroup
=
this
.
isEmpty
()
&&
this
.
accessor
.
partOptions
.
closeEmptyGroups
;
if
(
closeGroup
)
{
// Remove empty group if we should
if
(
closeEmptyGroup
)
{
this
.
accessor
.
removeGroup
(
this
);
}
}
...
...
src/vs/workbench/browser/parts/editor/editorPart.ts
浏览文件 @
00bdc456
...
...
@@ -111,7 +111,7 @@ export class EditorPart extends Part implements IEditorGroupsService, IEditorGro
this
.
registerListeners
();
}
//#region IEditor
PartOptions
//#region IEditor
GroupsAccessor
private
enforcedPartOptions
:
IEditorPartOptions
[]
=
[];
...
...
@@ -155,6 +155,14 @@ export class EditorPart extends Part implements IEditorGroupsService, IEditorGro
});
}
activatePreviousActiveGroup
():
void
{
const
mostRecentlyActiveGroups
=
this
.
getGroups
(
GroupsOrder
.
MOST_RECENTLY_ACTIVE
);
const
previousActiveGroup
=
mostRecentlyActiveGroups
[
1
];
if
(
previousActiveGroup
)
{
this
.
activateGroup
(
previousActiveGroup
);
}
}
//#endregion
//#region IEditorGroupsService
...
...
@@ -478,9 +486,7 @@ export class EditorPart extends Part implements IEditorGroupsService, IEditorGro
// Activate next group if the removed one was active
if
(
this
.
_activeGroup
===
groupView
)
{
const
mostRecentlyActiveGroups
=
this
.
getGroups
(
GroupsOrder
.
MOST_RECENTLY_ACTIVE
);
const
nextActiveGroup
=
mostRecentlyActiveGroups
[
1
];
// [0] will be the current group we are about to dispose
this
.
activateGroup
(
nextActiveGroup
);
this
.
activatePreviousActiveGroup
();
}
// Remove from grid widget & dispose
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录