Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
819a9129
V
vscode
项目概览
掘金者说
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
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,发现更多精彩内容 >>
提交
819a9129
编写于
7月 13, 2016
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
wip: do not set context to title area
上级
b3b35599
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
22 addition
and
32 deletion
+22
-32
src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts
src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts
+5
-10
src/vs/workbench/browser/parts/editor/sideBySideEditorControl.ts
...workbench/browser/parts/editor/sideBySideEditorControl.ts
+6
-7
src/vs/workbench/browser/parts/editor/tabsTitleControl.ts
src/vs/workbench/browser/parts/editor/tabsTitleControl.ts
+6
-9
src/vs/workbench/browser/parts/editor/titleControl.ts
src/vs/workbench/browser/parts/editor/titleControl.ts
+5
-6
未找到文件。
src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts
浏览文件 @
819a9129
...
...
@@ -10,7 +10,7 @@ import {IAction} from 'vs/base/common/actions';
import
{
prepareActions
}
from
'
vs/workbench/browser/actionBarRegistry
'
;
import
errors
=
require
(
'
vs/base/common/errors
'
);
import
arrays
=
require
(
'
vs/base/common/arrays
'
);
import
{
IEditorGroup
,
EditorInput
}
from
'
vs/workbench/common/editor
'
;
import
{
EditorInput
}
from
'
vs/workbench/common/editor
'
;
import
DOM
=
require
(
'
vs/base/browser/dom
'
);
import
{
ToolBar
}
from
'
vs/base/browser/ui/toolbar/toolbar
'
;
import
{
TitleControl
}
from
'
vs/workbench/browser/parts/editor/titleControl
'
;
...
...
@@ -26,16 +26,9 @@ export class NoTabsTitleControl extends TitleControl {
private
currentPrimaryEditorActionIds
:
string
[]
=
[];
private
currentSecondaryEditorActionIds
:
string
[]
=
[];
public
setContext
(
group
:
IEditorGroup
):
void
{
super
.
setContext
(
group
);
this
.
editorActionsToolbar
.
context
=
{
group
};
}
public
create
(
parent
:
HTMLElement
):
void
{
super
.
create
(
parent
);
this
.
titleContainer
=
parent
;
// Pin on double click
...
...
@@ -111,7 +104,9 @@ export class NoTabsTitleControl extends TitleControl {
}
protected
doRefresh
():
void
{
const
group
=
this
.
context
;
const
group
=
this
.
context
;
// TODO
this
.
editorActionsToolbar
.
context
=
{
group
};
const
editor
=
group
&&
group
.
activeEditor
;
if
(
!
editor
)
{
this
.
titleLabel
.
innerText
=
''
;
...
...
src/vs/workbench/browser/parts/editor/sideBySideEditorControl.ts
浏览文件 @
819a9129
...
...
@@ -195,11 +195,6 @@ export class SideBySideEditorControl implements ISideBySideEditorControl, IVerti
private
onStacksChanged
(
e
:
IStacksModelChangeEvent
):
void
{
// Up to date context
POSITIONS
.
forEach
(
position
=>
{
this
.
getTitleAreaControl
(
position
).
setContext
(
this
.
stacks
.
groupAt
(
position
));
});
// Refresh / update if group is visible and has a position
const
position
=
this
.
stacks
.
positionOfGroup
(
e
.
group
);
if
(
position
>=
0
)
{
...
...
@@ -1017,9 +1012,13 @@ export class SideBySideEditorControl implements ISideBySideEditorControl, IVerti
private
createTitleControl
(
context
:
IEditorGroup
,
silo
:
Builder
,
container
:
Builder
,
instantiationService
:
IInstantiationService
):
void
{
const
useTabs
=
!!
this
.
configurationService
.
getConfiguration
<
IWorkbenchEditorConfiguration
>
().
workbench
.
editor
.
showTabs
;
const
titleAreaControl
=
instantiationService
.
createInstance
<
ITitleAreaControl
>
(
useTabs
?
TabsTitleControl
:
NoTabsTitleControl
);
let
titleAreaControl
:
TabsTitleControl
|
NoTabsTitleControl
;
if
(
useTabs
)
{
titleAreaControl
=
instantiationService
.
createInstance
(
TabsTitleControl
,
()
=>
this
.
stacks
.
groupAt
(
this
.
findPosition
(
container
.
getHTMLElement
())));
}
else
{
titleAreaControl
=
instantiationService
.
createInstance
(
NoTabsTitleControl
,
()
=>
this
.
stacks
.
groupAt
(
this
.
findPosition
(
container
.
getHTMLElement
())));
}
titleAreaControl
.
create
(
container
.
getHTMLElement
());
titleAreaControl
.
setContext
(
context
);
titleAreaControl
.
refresh
();
silo
.
child
().
setProperty
(
SideBySideEditorControl
.
TITLE_AREA_CONTROL_KEY
,
titleAreaControl
);
// associate with container
...
...
src/vs/workbench/browser/parts/editor/tabsTitleControl.ts
浏览文件 @
819a9129
...
...
@@ -49,6 +49,7 @@ export class TabsTitleControl extends TitleControl {
private
currentSecondaryGroupActionIds
:
string
[]
=
[];
constructor
(
getContext
:()
=>
IEditorGroup
,
@
IContextMenuService
contextMenuService
:
IContextMenuService
,
@
IInstantiationService
instantiationService
:
IInstantiationService
,
@
IConfigurationService
configurationService
:
IConfigurationService
,
...
...
@@ -60,7 +61,7 @@ export class TabsTitleControl extends TitleControl {
@
IMessageService
messageService
:
IMessageService
,
@
IMenuService
menuService
:
IMenuService
)
{
super
(
contextMenuService
,
instantiationService
,
configurationService
,
editorService
,
editorGroupService
,
keybindingService
,
telemetryService
,
messageService
,
menuService
);
super
(
getContext
,
contextMenuService
,
instantiationService
,
configurationService
,
editorService
,
editorGroupService
,
keybindingService
,
telemetryService
,
messageService
,
menuService
);
this
.
currentPrimaryGroupActionIds
=
[];
this
.
currentSecondaryGroupActionIds
=
[];
...
...
@@ -68,15 +69,9 @@ export class TabsTitleControl extends TitleControl {
this
.
tabDisposeables
=
[];
}
public
setContext
(
group
:
IEditorGroup
):
void
{
super
.
setContext
(
group
);
this
.
groupActionsToolbar
.
context
=
{
group
};
}
public
create
(
parent
:
HTMLElement
):
void
{
super
.
create
(
parent
);
this
.
titleContainer
=
parent
;
// Tabs Container
...
...
@@ -223,7 +218,9 @@ export class TabsTitleControl extends TitleControl {
}
protected
doRefresh
():
void
{
const
group
=
this
.
context
;
const
group
=
this
.
context
;
// TODO
this
.
groupActionsToolbar
.
context
=
{
group
};
const
editor
=
group
&&
group
.
activeEditor
;
if
(
!
editor
)
{
this
.
clearTabs
();
...
...
src/vs/workbench/browser/parts/editor/titleControl.ts
浏览文件 @
819a9129
...
...
@@ -41,7 +41,6 @@ export interface IToolbarActions {
}
export
interface
ITitleAreaControl
{
setContext
(
group
:
IEditorGroup
):
void
;
allowDragging
(
element
:
HTMLElement
):
boolean
;
create
(
parent
:
HTMLElement
):
void
;
getContainer
():
HTMLElement
;
...
...
@@ -56,7 +55,6 @@ export abstract class TitleControl implements ITitleAreaControl {
private
static
draggedEditor
:
IEditorIdentifier
;
protected
stacks
:
IEditorStacksModel
;
protected
context
:
IEditorGroup
;
protected
toDispose
:
IDisposable
[];
protected
closeEditorAction
:
CloseEditorAction
;
...
...
@@ -83,6 +81,7 @@ export abstract class TitleControl implements ITitleAreaControl {
private
contributedTitleBarMenu
:
IMenu
;
constructor
(
private
getContext
:()
=>
IEditorGroup
,
@
IContextMenuService
protected
contextMenuService
:
IContextMenuService
,
@
IInstantiationService
protected
instantiationService
:
IInstantiationService
,
@
IConfigurationService
protected
configurationService
:
IConfigurationService
,
...
...
@@ -112,6 +111,10 @@ export abstract class TitleControl implements ITitleAreaControl {
this
.
registerListeners
();
}
protected
get
context
():
IEditorGroup
{
return
this
.
getContext
();
}
public
static
getDraggedEditor
():
IEditorIdentifier
{
return
TitleControl
.
draggedEditor
;
}
...
...
@@ -161,10 +164,6 @@ export abstract class TitleControl implements ITitleAreaControl {
this
.
refreshScheduled
=
false
;
}
public
setContext
(
group
:
IEditorGroup
):
void
{
this
.
context
=
group
;
}
public
update
(
instant
?:
boolean
):
void
{
if
(
instant
)
{
this
.
scheduler
.
cancel
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录