Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
80f35559
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,发现更多精彩内容 >>
提交
80f35559
编写于
10月 24, 2017
作者:
I
isidor
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
vertical panel: add a secondary x sash to the workbench layout
上级
0585cef4
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
82 addition
and
40 deletion
+82
-40
src/vs/workbench/browser/layout.ts
src/vs/workbench/browser/layout.ts
+81
-39
src/vs/workbench/electron-browser/workbench.ts
src/vs/workbench/electron-browser/workbench.ts
+1
-1
未找到文件。
src/vs/workbench/browser/layout.ts
浏览文件 @
80f35559
...
...
@@ -45,7 +45,8 @@ interface PartLayoutInfo {
*/
export
class
WorkbenchLayout
implements
IVerticalSashLayoutProvider
,
IHorizontalSashLayoutProvider
{
private
static
sashXWidthSettingsKey
=
'
workbench.sidebar.width
'
;
private
static
sashXOneWidthSettingsKey
=
'
workbench.sidebar.width
'
;
private
static
sashXTwoWidthSettingsKey
=
'
workbench.panel.width
'
;
private
static
sashYHeightSettingsKey
=
'
workbench.panel.height
'
;
private
parent
:
Builder
;
...
...
@@ -60,15 +61,14 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
private
toUnbind
:
IDisposable
[];
private
partLayoutInfo
:
PartLayoutInfo
;
private
workbenchSize
:
Dimension
;
private
sashX
:
Sash
;
private
sashXOne
:
Sash
;
private
sashXTwo
:
Sash
;
private
sashY
:
Sash
;
private
startSidebarWidth
:
number
;
private
sidebarWidth
:
number
;
private
sidebarHeight
:
number
;
private
titlebarHeight
:
number
;
private
activitybarWidth
:
number
;
private
statusbarHeight
:
number
;
private
startPanelHeight
:
number
;
private
panelHeight
:
number
;
private
panelHeightBeforeMaximized
:
number
;
private
panelMaximized
:
boolean
;
...
...
@@ -110,7 +110,11 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
this
.
panelHeightBeforeMaximized
=
0
;
this
.
panelMaximized
=
false
;
this
.
sashX
=
new
Sash
(
this
.
workbenchContainer
.
getHTMLElement
(),
this
,
{
this
.
sashXOne
=
new
Sash
(
this
.
workbenchContainer
.
getHTMLElement
(),
this
,
{
baseSize
:
5
});
this
.
sashXTwo
=
new
Sash
(
this
.
workbenchContainer
.
getHTMLElement
(),
this
,
{
baseSize
:
5
});
...
...
@@ -119,8 +123,9 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
orientation
:
Orientation
.
HORIZONTAL
});
this
.
sidebarWidth
=
this
.
storageService
.
getInteger
(
WorkbenchLayout
.
sashXWidthSettingsKey
,
StorageScope
.
GLOBAL
,
-
1
);
this
.
sidebarWidth
=
this
.
storageService
.
getInteger
(
WorkbenchLayout
.
sashX
One
WidthSettingsKey
,
StorageScope
.
GLOBAL
,
-
1
);
this
.
panelHeight
=
this
.
storageService
.
getInteger
(
WorkbenchLayout
.
sashYHeightSettingsKey
,
StorageScope
.
GLOBAL
,
0
);
this
.
panelWidth
=
this
.
storageService
.
getInteger
(
WorkbenchLayout
.
sashXTwoWidthSettingsKey
,
StorageScope
.
GLOBAL
,
0
);
this
.
layoutEditorGroupsVertically
=
(
this
.
editorGroupService
.
getGroupOrientation
()
!==
'
horizontal
'
);
...
...
@@ -158,22 +163,31 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
private
registerSashListeners
():
void
{
let
startX
:
number
=
0
;
let
startY
:
number
=
0
;
let
startX2
:
number
=
0
;
let
startSidebarWidth
:
number
;
let
startPanelHeight
:
number
;
let
startPanelWidth
:
number
;
this
.
sashX
.
addListener
(
'
start
'
,
(
e
:
ISashEvent
)
=>
{
this
.
startSidebarWidth
=
this
.
sidebarWidth
;
this
.
toUnbind
.
push
(
this
.
sashXOne
.
addListener
(
'
start
'
,
(
e
:
ISashEvent
)
=>
{
startSidebarWidth
=
this
.
sidebarWidth
;
startX
=
e
.
startX
;
});
})
)
;
this
.
sashY
.
addListener
(
'
start
'
,
(
e
:
ISashEvent
)
=>
{
this
.
startPanelHeight
=
this
.
panelHeight
;
this
.
toUnbind
.
push
(
this
.
sashY
.
addListener
(
'
start
'
,
(
e
:
ISashEvent
)
=>
{
startPanelHeight
=
this
.
panelHeight
;
startY
=
e
.
startY
;
});
}));
this
.
toUnbind
.
push
(
this
.
sashXTwo
.
addListener
(
'
start
'
,
(
e
:
ISashEvent
)
=>
{
startPanelWidth
=
this
.
panelWidth
;
startX2
=
e
.
startX
;
}));
this
.
sashX
.
addListener
(
'
change
'
,
(
e
:
ISashEvent
)
=>
{
this
.
toUnbind
.
push
(
this
.
sashXOne
.
addListener
(
'
change
'
,
(
e
:
ISashEvent
)
=>
{
let
doLayout
=
false
;
let
sidebarPosition
=
this
.
partService
.
getSideBarPosition
();
let
isSidebarVisible
=
this
.
partService
.
isVisible
(
Parts
.
SIDEBAR_PART
);
let
newSashWidth
=
(
sidebarPosition
===
Position
.
LEFT
)
?
this
.
startSidebarWidth
+
e
.
currentX
-
startX
:
this
.
startSidebarWidth
-
e
.
currentX
+
startX
;
let
newSashWidth
=
(
sidebarPosition
===
Position
.
LEFT
)
?
startSidebarWidth
+
e
.
currentX
-
startX
:
startSidebarWidth
-
e
.
currentX
+
startX
;
let
promise
=
TPromise
.
as
<
void
>
(
null
);
// Sidebar visible
...
...
@@ -184,7 +198,7 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
let
dragCompensation
=
MIN_SIDEBAR_PART_WIDTH
-
HIDE_SIDEBAR_WIDTH_THRESHOLD
;
promise
=
this
.
partService
.
setSideBarHidden
(
true
);
startX
=
(
sidebarPosition
===
Position
.
LEFT
)
?
Math
.
max
(
this
.
activitybarWidth
,
e
.
currentX
-
dragCompensation
)
:
Math
.
min
(
e
.
currentX
+
dragCompensation
,
this
.
workbenchSize
.
width
-
this
.
activitybarWidth
);
this
.
sidebarWidth
=
this
.
startSidebarWidth
;
// when restoring sidebar, restore to the sidebar width we started from
this
.
sidebarWidth
=
startSidebarWidth
;
// when restoring sidebar, restore to the sidebar width we started from
}
// Otherwise size the sidebar accordingly
...
...
@@ -198,7 +212,7 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
else
{
if
((
sidebarPosition
===
Position
.
LEFT
&&
e
.
currentX
-
startX
>=
this
.
partLayoutInfo
.
sidebar
.
minWidth
)
||
(
sidebarPosition
===
Position
.
RIGHT
&&
startX
-
e
.
currentX
>=
this
.
partLayoutInfo
.
sidebar
.
minWidth
))
{
this
.
startSidebarWidth
=
this
.
partLayoutInfo
.
sidebar
.
minWidth
-
(
sidebarPosition
===
Position
.
LEFT
?
e
.
currentX
-
startX
:
startX
-
e
.
currentX
);
startSidebarWidth
=
this
.
partLayoutInfo
.
sidebar
.
minWidth
-
(
sidebarPosition
===
Position
.
LEFT
?
e
.
currentX
-
startX
:
startX
-
e
.
currentX
);
this
.
sidebarWidth
=
this
.
partLayoutInfo
.
sidebar
.
minWidth
;
promise
=
this
.
partService
.
setSideBarHidden
(
false
);
}
...
...
@@ -207,12 +221,12 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
if
(
doLayout
)
{
promise
.
done
(()
=>
this
.
layout
(),
errors
.
onUnexpectedError
);
}
});
})
)
;
this
.
sashY
.
addListener
(
'
change
'
,
(
e
:
ISashEvent
)
=>
{
this
.
toUnbind
.
push
(
this
.
sashY
.
addListener
(
'
change
'
,
(
e
:
ISashEvent
)
=>
{
let
doLayout
=
false
;
let
isPanelVisible
=
this
.
partService
.
isVisible
(
Parts
.
PANEL_PART
);
let
newSashHeight
=
this
.
startPanelHeight
-
(
e
.
currentY
-
startY
);
let
newSashHeight
=
startPanelHeight
-
(
e
.
currentY
-
startY
);
let
promise
=
TPromise
.
as
<
void
>
(
null
);
// Panel visible
...
...
@@ -223,7 +237,7 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
let
dragCompensation
=
MIN_PANEL_PART_HEIGHT
-
HIDE_PANEL_HEIGHT_THRESHOLD
;
promise
=
this
.
partService
.
setPanelHidden
(
true
);
startY
=
Math
.
min
(
this
.
sidebarHeight
-
this
.
statusbarHeight
-
this
.
titlebarHeight
,
e
.
currentY
+
dragCompensation
);
this
.
panelHeight
=
this
.
startPanelHeight
;
// when restoring panel, restore to the panel height we started from
this
.
panelHeight
=
startPanelHeight
;
// when restoring panel, restore to the panel height we started from
}
// Otherwise size the panel accordingly
...
...
@@ -236,7 +250,7 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
// Panel hidden
else
{
if
(
startY
-
e
.
currentY
>=
this
.
partLayoutInfo
.
panel
.
minHeight
)
{
this
.
startPanelHeight
=
0
;
startPanelHeight
=
0
;
this
.
panelHeight
=
this
.
partLayoutInfo
.
panel
.
minHeight
;
promise
=
this
.
partService
.
setPanelHidden
(
false
);
}
...
...
@@ -245,29 +259,44 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
if
(
doLayout
)
{
promise
.
done
(()
=>
this
.
layout
(),
errors
.
onUnexpectedError
);
}
});
})
)
;
this
.
sashX
.
addListener
(
'
end
'
,
()
=>
{
this
.
storageService
.
store
(
WorkbenchLayout
.
sashXWidthSettingsKey
,
this
.
sidebarWidth
,
StorageScope
.
GLOBAL
);
});
this
.
toUnbind
.
push
(
this
.
sashXTwo
.
addListener
(
'
change
'
,
(
e
:
ISashEvent
)
=>
{
console
.
log
(
'
change
'
);
// TODO@Isidor
}));
this
.
sashY
.
addListener
(
'
end
'
,
()
=>
{
this
.
toUnbind
.
push
(
this
.
sashXOne
.
addListener
(
'
end
'
,
()
=>
{
this
.
storageService
.
store
(
WorkbenchLayout
.
sashXOneWidthSettingsKey
,
this
.
sidebarWidth
,
StorageScope
.
GLOBAL
);
}));
this
.
toUnbind
.
push
(
this
.
sashY
.
addListener
(
'
end
'
,
()
=>
{
this
.
storageService
.
store
(
WorkbenchLayout
.
sashYHeightSettingsKey
,
this
.
panelHeight
,
StorageScope
.
GLOBAL
);
});
})
)
;
this
.
sashY
.
addListener
(
'
reset
'
,
()
=>
{
this
.
toUnbind
.
push
(
this
.
sashXTwo
.
addListener
(
'
end
'
,
()
=>
{
this
.
storageService
.
store
(
WorkbenchLayout
.
sashXTwoWidthSettingsKey
,
this
.
panelWidth
,
StorageScope
.
GLOBAL
);
}));
this
.
toUnbind
.
push
(
this
.
sashY
.
addListener
(
'
reset
'
,
()
=>
{
this
.
panelHeight
=
this
.
sidebarHeight
*
DEFAULT_PANEL_HEIGHT_COEFFICIENT
;
this
.
storageService
.
store
(
WorkbenchLayout
.
sashYHeightSettingsKey
,
this
.
panelHeight
,
StorageScope
.
GLOBAL
);
this
.
partService
.
setPanelHidden
(
false
).
done
(()
=>
this
.
layout
(),
errors
.
onUnexpectedError
);
});
this
.
layout
(
);
})
)
;
this
.
sashX
.
addListener
(
'
reset
'
,
()
=>
{
this
.
toUnbind
.
push
(
this
.
sashXOne
.
addListener
(
'
reset
'
,
()
=>
{
let
activeViewlet
=
this
.
viewletService
.
getActiveViewlet
();
let
optimalWidth
=
activeViewlet
&&
activeViewlet
.
getOptimalWidth
();
this
.
sidebarWidth
=
Math
.
max
(
MIN_SIDEBAR_PART_WIDTH
,
optimalWidth
||
0
);
this
.
storageService
.
store
(
WorkbenchLayout
.
sashXWidthSettingsKey
,
this
.
sidebarWidth
,
StorageScope
.
GLOBAL
);
this
.
storageService
.
store
(
WorkbenchLayout
.
sashX
One
WidthSettingsKey
,
this
.
sidebarWidth
,
StorageScope
.
GLOBAL
);
this
.
partService
.
setSideBarHidden
(
false
).
done
(()
=>
this
.
layout
(),
errors
.
onUnexpectedError
);
});
}));
this
.
toUnbind
.
push
(
this
.
sashXTwo
.
addListener
(
'
reset
'
,
()
=>
{
this
.
panelWidth
=
0
;
// TODO@ISIDOR
this
.
storageService
.
store
(
WorkbenchLayout
.
sashXTwoWidthSettingsKey
,
this
.
panelWidth
,
StorageScope
.
GLOBAL
);
this
.
layout
();
}));
}
private
onEditorsChanged
():
void
{
...
...
@@ -308,6 +337,7 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
const
isStatusbarHidden
=
!
this
.
partService
.
isVisible
(
Parts
.
STATUSBAR_PART
);
const
isSidebarHidden
=
!
this
.
partService
.
isVisible
(
Parts
.
SIDEBAR_PART
);
const
sidebarPosition
=
this
.
partService
.
getSideBarPosition
();
const
panelPosition
=
this
.
partService
.
getPanelPosition
();
// Sidebar
let
sidebarWidth
:
number
;
...
...
@@ -409,12 +439,14 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
if
(
!
isSidebarHidden
)
{
this
.
sidebarWidth
=
sidebarSize
.
width
;
this
.
storageService
.
store
(
WorkbenchLayout
.
sashXWidthSettingsKey
,
this
.
sidebarWidth
,
StorageScope
.
GLOBAL
);
this
.
storageService
.
store
(
WorkbenchLayout
.
sashX
One
WidthSettingsKey
,
this
.
sidebarWidth
,
StorageScope
.
GLOBAL
);
}
if
(
!
isPanelHidden
)
{
this
.
panelHeight
=
panelDimension
.
height
;
this
.
panelWidth
=
panelDimension
.
width
;
this
.
storageService
.
store
(
WorkbenchLayout
.
sashYHeightSettingsKey
,
this
.
panelHeight
,
StorageScope
.
GLOBAL
);
this
.
storageService
.
store
(
WorkbenchLayout
.
sashXTwoWidthSettingsKey
,
this
.
panelWidth
,
StorageScope
.
GLOBAL
);
}
// Workbench
...
...
@@ -490,8 +522,14 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
this
.
quickopen
.
layout
(
this
.
workbenchSize
);
// Sashes
this
.
sashX
.
layout
();
this
.
sashXOne
.
layout
();
if
(
panelPosition
===
Position
.
BOTTOM
)
{
this
.
sashY
.
layout
();
this
.
sashXTwo
.
hide
();
}
else
{
this
.
sashY
.
hide
();
this
.
sashXTwo
.
layout
();
}
// Propagate to Part Layouts
this
.
titlebar
.
layout
(
new
Dimension
(
this
.
workbenchSize
.
width
,
this
.
titlebarHeight
));
...
...
@@ -511,6 +549,7 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
public
getVerticalSashLeft
(
sash
:
Sash
):
number
{
let
isSidebarVisible
=
this
.
partService
.
isVisible
(
Parts
.
SIDEBAR_PART
);
let
sidebarPosition
=
this
.
partService
.
getSideBarPosition
();
if
(
sash
===
this
.
sashXOne
)
{
if
(
sidebarPosition
===
Position
.
LEFT
)
{
return
isSidebarVisible
?
this
.
sidebarWidth
+
this
.
activitybarWidth
:
this
.
activitybarWidth
;
...
...
@@ -519,6 +558,9 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
return
isSidebarVisible
?
this
.
workbenchSize
.
width
-
this
.
sidebarWidth
-
this
.
activitybarWidth
:
this
.
workbenchSize
.
width
-
this
.
activitybarWidth
;
}
return
this
.
workbenchSize
.
width
-
this
.
panelWidth
-
(
sidebarPosition
===
Position
.
RIGHT
&&
isSidebarVisible
?
this
.
sidebarWidth
+
this
.
activitybarWidth
:
0
);
}
public
getVerticalSashHeight
(
sash
:
Sash
):
number
{
return
this
.
sidebarHeight
;
}
...
...
src/vs/workbench/electron-browser/workbench.ts
浏览文件 @
80f35559
...
...
@@ -1226,7 +1226,7 @@ export class Workbench implements IPartService {
private
createPanelPart
():
void
{
const
panelPartContainer
=
$
(
this
.
workbench
)
.
div
({
'
class
'
:
[
'
part
'
,
'
panel
'
],
'
class
'
:
[
'
part
'
,
'
panel
'
,
this
.
panelPosition
===
Position
.
BOTTOM
?
'
bottom
'
:
'
right
'
],
id
:
Identifiers
.
PANEL_PART
,
role
:
'
complementary
'
});
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录