Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
754bf961
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,发现更多精彩内容 >>
提交
754bf961
编写于
5月 10, 2016
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
adopt new event style for onFocusChange
上级
5520b5e3
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
15 addition
and
12 deletion
+15
-12
src/vs/workbench/browser/parts/editor/editorPart.ts
src/vs/workbench/browser/parts/editor/editorPart.ts
+3
-2
src/vs/workbench/browser/parts/editor/sideBySideEditorControl.ts
...workbench/browser/parts/editor/sideBySideEditorControl.ts
+12
-10
未找到文件。
src/vs/workbench/browser/parts/editor/editorPart.ts
浏览文件 @
754bf961
...
...
@@ -27,7 +27,7 @@ import {EventType as WorkbenchEventType, EditorEvent} from 'vs/workbench/common/
import
{
IEditorRegistry
,
Extensions
as
EditorExtensions
,
BaseEditor
,
IEditorInputActionContext
,
EditorDescriptor
}
from
'
vs/workbench/browser/parts/editor/baseEditor
'
;
import
{
EditorInput
,
EditorOptions
,
TextEditorOptions
}
from
'
vs/workbench/common/editor
'
;
import
{
BaseTextEditor
}
from
'
vs/workbench/browser/parts/editor/textEditor
'
;
import
{
EventType
as
SideBySideEventType
,
SideBySideEditorControl
,
Rochade
}
from
'
vs/workbench/browser/parts/editor/sideBySideEditorControl
'
;
import
{
SideBySideEditorControl
,
Rochade
}
from
'
vs/workbench/browser/parts/editor/sideBySideEditorControl
'
;
import
{
WorkbenchProgressService
}
from
'
vs/workbench/services/progress/browser/progressService
'
;
import
{
EditorArrangement
}
from
'
vs/workbench/services/editor/common/editorService
'
;
import
{
IEditorPart
}
from
'
vs/workbench/services/editor/browser/editorService
'
;
...
...
@@ -897,7 +897,8 @@ export class EditorPart extends Part implements IEditorPart {
// Side by Side Control
this
.
sideBySideControl
=
this
.
instantiationService
.
createInstance
(
SideBySideEditorControl
,
contentArea
);
this
.
toUnbind
.
push
(
this
.
sideBySideControl
.
addListener
(
SideBySideEventType
.
EDITOR_FOCUS_CHANGED
,
()
=>
{
this
.
onEditorFocusChanged
();
}));
const
unbind
=
this
.
sideBySideControl
.
onEditorFocusChange
(()
=>
this
.
onEditorFocusChanged
());
this
.
toUnbind
.
push
(()
=>
unbind
.
dispose
());
// get settings
this
.
memento
=
this
.
getMemento
(
this
.
storageService
,
MementoScope
.
WORKSPACE
);
...
...
src/vs/workbench/browser/parts/editor/sideBySideEditorControl.ts
浏览文件 @
754bf961
...
...
@@ -11,7 +11,7 @@ import {Registry} from 'vs/platform/platform';
import
{
Scope
,
IActionBarRegistry
,
Extensions
}
from
'
vs/workbench/browser/actionBarRegistry
'
;
import
{
IAction
,
Action
}
from
'
vs/base/common/actions
'
;
import
arrays
=
require
(
'
vs/base/common/arrays
'
);
import
{
EventEmitter
}
from
'
vs/base/common/eventEmitter
'
;
import
Event
,
{
Emitter
}
from
'
vs/base/common/event
'
;
import
{
StandardMouseEvent
}
from
'
vs/base/browser/mouseEvent
'
;
import
errors
=
require
(
'
vs/base/common/errors
'
);
import
{
isWindows
}
from
'
vs/base/common/platform
'
;
...
...
@@ -45,14 +45,10 @@ export enum Rochade {
CENTER_AND_RIGHT_TO_LEFT
}
export
const
EventType
=
{
EDITOR_FOCUS_CHANGED
:
'
editorFocusChanged
'
};
/**
* Helper class to manage multiple side by side editors for the editor part.
*/
export
class
SideBySideEditorControl
extends
EventEmitter
implements
IVerticalSashLayoutProvider
{
export
class
SideBySideEditorControl
implements
IVerticalSashLayoutProvider
{
private
static
MIN_EDITOR_WIDTH
=
170
;
private
static
EDITOR_TITLE_HEIGHT
=
35
;
...
...
@@ -91,6 +87,8 @@ export class SideBySideEditorControl extends EventEmitter implements IVerticalSa
private
visibleEditorFocusTrackers
:
DOM
.
IFocusTracker
[];
private
editorInputStateChangeListener
:
()
=>
void
;
private
_onEditorFocusChange
:
Emitter
<
void
>
;
constructor
(
parent
:
Builder
,
@
IWorkbenchEditorService
private
editorService
:
IWorkbenchEditorService
,
...
...
@@ -103,8 +101,6 @@ export class SideBySideEditorControl extends EventEmitter implements IVerticalSa
@
IWorkspaceContextService
private
contextService
:
IWorkspaceContextService
,
@
IInstantiationService
private
instantiationService
:
IInstantiationService
)
{
super
();
this
.
parent
=
parent
;
this
.
dimension
=
new
Dimension
(
0
,
0
);
...
...
@@ -122,6 +118,8 @@ export class SideBySideEditorControl extends EventEmitter implements IVerticalSa
this
.
visibleEditorContainers
=
[];
this
.
visibleEditorFocusTrackers
=
[];
this
.
_onEditorFocusChange
=
new
Emitter
<
void
>
();
this
.
closeEditorAction
=
POSITIONS
.
map
((
position
)
=>
this
.
instantiationService
.
createInstance
(
CloseEditorAction
,
CLOSE_EDITOR_ACTION_ID
,
CLOSE_EDITOR_ACTION_LABEL
));
POSITIONS
.
map
((
position
)
=>
this
.
closeEditorAction
[
position
].
setPosition
(
position
)
||
(
this
.
closeEditorAction
[
position
].
class
=
'
close-editor-action
'
));
this
.
splitEditorAction
=
this
.
instantiationService
.
createInstance
(
SplitEditorAction
,
SPLIT_EDITOR_ACTION_ID
,
SPLIT_EDITOR_ACTION_LABEL
);
...
...
@@ -161,6 +159,10 @@ export class SideBySideEditorControl extends EventEmitter implements IVerticalSa
);
}
public
get
onEditorFocusChange
():
Event
<
void
>
{
return
this
.
_onEditorFocusChange
.
event
;
}
public
show
(
editor
:
BaseEditor
,
container
:
Builder
,
position
:
Position
,
preserveActive
:
boolean
,
widthRatios
?:
number
[]):
void
{
let
visibleEditorCount
=
this
.
getVisibleEditorCount
();
...
...
@@ -330,7 +332,7 @@ export class SideBySideEditorControl extends EventEmitter implements IVerticalSa
}
// Re-emit to outside
this
.
emit
(
EventType
.
EDITOR_FOCUS_CHANGED
);
this
.
_onEditorFocusChange
.
fire
(
);
}
}
...
...
@@ -1540,6 +1542,6 @@ export class SideBySideEditorControl extends EventEmitter implements IVerticalSa
this
.
visibleEditors
=
null
;
this
.
visibleEditorContainers
=
null
;
super
.
dispose
();
this
.
_onEditorFocusChange
.
dispose
();
}
}
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录