Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
3d63750f
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,发现更多精彩内容 >>
提交
3d63750f
编写于
10月 03, 2017
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
prevent recursive splitview mutations
fixes #35497
上级
7d5ae744
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
67 addition
and
3 deletion
+67
-3
src/vs/base/browser/ui/splitview/splitview.ts
src/vs/base/browser/ui/splitview/splitview.ts
+35
-0
src/vs/base/test/browser/ui/splitview/splitview.test.ts
src/vs/base/test/browser/ui/splitview/splitview.test.ts
+29
-0
src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts
src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts
+3
-3
未找到文件。
src/vs/base/browser/ui/splitview/splitview.ts
浏览文件 @
3d63750f
...
...
@@ -54,6 +54,11 @@ interface ISashDragState {
maxDelta
:
number
;
}
enum
State
{
Idle
,
Busy
}
export
class
SplitView
implements
IDisposable
{
private
orientation
:
Orientation
;
...
...
@@ -63,6 +68,7 @@ export class SplitView implements IDisposable {
private
viewItems
:
IViewItem
[]
=
[];
private
sashItems
:
ISashItem
[]
=
[];
private
sashDragState
:
ISashDragState
;
private
state
:
State
=
State
.
Idle
;
get
length
():
number
{
return
this
.
viewItems
.
length
;
...
...
@@ -78,6 +84,12 @@ export class SplitView implements IDisposable {
}
addView
(
view
:
IView
,
size
:
number
,
index
=
this
.
viewItems
.
length
):
void
{
if
(
this
.
state
!==
State
.
Idle
)
{
throw
new
Error
(
'
Cant modify splitview
'
);
}
this
.
state
=
State
.
Busy
;
// Add view
const
container
=
dom
.
$
(
'
.split-view-view
'
);
...
...
@@ -125,9 +137,16 @@ export class SplitView implements IDisposable {
view
.
render
(
container
,
this
.
orientation
);
this
.
relayout
();
this
.
state
=
State
.
Idle
;
}
removeView
(
index
:
number
):
void
{
if
(
this
.
state
!==
State
.
Idle
)
{
throw
new
Error
(
'
Cant modify splitview
'
);
}
this
.
state
=
State
.
Busy
;
if
(
index
<
0
||
index
>=
this
.
viewItems
.
length
)
{
return
;
}
...
...
@@ -144,9 +163,16 @@ export class SplitView implements IDisposable {
}
this
.
relayout
();
this
.
state
=
State
.
Idle
;
}
moveView
(
from
:
number
,
to
:
number
):
void
{
if
(
this
.
state
!==
State
.
Idle
)
{
throw
new
Error
(
'
Cant modify splitview
'
);
}
this
.
state
=
State
.
Busy
;
if
(
from
<
0
||
from
>=
this
.
viewItems
.
length
)
{
return
;
}
...
...
@@ -169,6 +195,7 @@ export class SplitView implements IDisposable {
}
this
.
layoutViews
();
this
.
state
=
State
.
Idle
;
}
private
relayout
():
void
{
...
...
@@ -221,6 +248,12 @@ export class SplitView implements IDisposable {
}
resizeView
(
index
:
number
,
size
:
number
):
void
{
if
(
this
.
state
!==
State
.
Idle
)
{
throw
new
Error
(
'
Cant modify splitview
'
);
}
this
.
state
=
State
.
Busy
;
if
(
index
<
0
||
index
>=
this
.
viewItems
.
length
)
{
return
;
}
...
...
@@ -248,6 +281,8 @@ export class SplitView implements IDisposable {
this
.
resize
(
index
-
1
,
deltaUp
);
}
this
.
state
=
State
.
Idle
;
}
getViewSize
(
index
:
number
):
number
{
...
...
src/vs/base/test/browser/ui/splitview/splitview.test.ts
浏览文件 @
3d63750f
...
...
@@ -311,4 +311,33 @@ suite('Splitview', () => {
view2
.
dispose
();
view1
.
dispose
();
});
test
(
'
issue #35497
'
,
()
=>
{
const
view1
=
new
TestView
(
160
,
Number
.
POSITIVE_INFINITY
);
const
view2
=
new
TestView
(
66
,
66
);
const
splitview
=
new
SplitView
(
container
);
splitview
.
layout
(
986
);
splitview
.
addView
(
view1
,
142
,
0
);
assert
.
equal
(
view1
.
size
,
986
,
'
first view is stretched
'
);
view2
.
onDidRender
(()
=>
{
assert
.
throws
(()
=>
splitview
.
resizeView
(
1
,
922
));
assert
.
throws
(()
=>
splitview
.
resizeView
(
1
,
922
));
});
splitview
.
addView
(
view2
,
66
,
0
);
assert
.
equal
(
view2
.
size
,
66
,
'
second view is fixed
'
);
assert
.
equal
(
view1
.
size
,
986
-
66
,
'
first view is collapsed
'
);
const
viewContainers
=
container
.
querySelectorAll
(
'
.split-view-view
'
);
assert
.
equal
(
viewContainers
.
length
,
2
,
'
there are two view containers
'
);
assert
.
equal
((
viewContainers
.
item
(
0
)
as
HTMLElement
).
style
.
height
,
'
66px
'
,
'
second view container is 66px
'
);
assert
.
equal
((
viewContainers
.
item
(
1
)
as
HTMLElement
).
style
.
height
,
`
${
986
-
66
}
px`
,
'
first view container is 66px
'
);
splitview
.
dispose
();
view2
.
dispose
();
view1
.
dispose
();
});
});
\ No newline at end of file
src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts
浏览文件 @
3d63750f
...
...
@@ -851,9 +851,10 @@ export class SCMViewlet extends PanelViewlet implements IViewModel {
if
(
shouldMainPanelBeVisible
)
{
this
.
mainPanel
=
this
.
instantiationService
.
createInstance
(
MainPanel
,
this
);
const
selectionChangeDisposable
=
this
.
mainPanel
.
onSelectionChange
(
this
.
onSelectionChange
,
this
);
this
.
addPanel
(
this
.
mainPanel
,
this
.
mainPanel
.
minimumSize
,
0
);
const
selectionChangeDisposable
=
this
.
mainPanel
.
onSelectionChange
(
this
.
onSelectionChange
,
this
);
this
.
mainPanelDisposable
=
toDisposable
(()
=>
{
this
.
removePanel
(
this
.
mainPanel
);
selectionChangeDisposable
.
dispose
();
...
...
@@ -959,7 +960,7 @@ export class SCMViewlet extends PanelViewlet implements IViewModel {
}
protected
isSingleView
():
boolean
{
return
super
.
isSingleView
()
&&
this
.
repositor
ie
s
.
length
===
1
;
return
super
.
isSingleView
()
&&
this
.
repositor
yPanel
s
.
length
===
1
;
}
hide
(
repository
:
ISCMRepository
):
void
{
...
...
@@ -970,7 +971,6 @@ export class SCMViewlet extends PanelViewlet implements IViewModel {
this
.
mainPanel
.
hide
(
repository
);
}
dispose
():
void
{
this
.
disposables
=
dispose
(
this
.
disposables
);
this
.
mainPanelDisposable
.
dispose
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录