Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
1bfb4a47
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,发现更多精彩内容 >>
提交
1bfb4a47
编写于
1月 24, 2019
作者:
S
SteVen Batten
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fixes double titlebar when native
#67020
上级
f14dceaf
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
9 addition
and
35 deletion
+9
-35
src/vs/workbench/electron-browser/workbench.ts
src/vs/workbench/electron-browser/workbench.ts
+9
-35
未找到文件。
src/vs/workbench/electron-browser/workbench.ts
浏览文件 @
1bfb4a47
...
...
@@ -223,7 +223,6 @@ export class Workbench extends Disposable implements IPartService {
private
notificationsToasts
:
NotificationsToasts
;
private
sideBarHidden
:
boolean
;
private
titleBarHidden
:
boolean
;
private
statusBarHidden
:
boolean
;
private
activityBarHidden
:
boolean
;
private
menubarToggled
:
boolean
;
...
...
@@ -1009,7 +1008,6 @@ export class Workbench extends Disposable implements IPartService {
const
serializedWorkbenchGridString
=
this
.
storageService
.
get
(
Workbench
.
workbenchGridUIStateStorageKey
,
StorageScope
.
GLOBAL
,
undefined
);
if
(
serializedWorkbenchGridString
)
{
console
.
log
(
serializedWorkbenchGridString
);
const
serializedWorkbenchGrid
=
JSON
.
parse
(
serializedWorkbenchGridString
)
as
ISerializedGrid
;
this
.
workbenchGrid
=
SerializableGrid
.
deserialize
(
serializedWorkbenchGrid
,
{
fromJSON
:
(
serializedView
:
{
type
:
Parts
}):
WorkbenchView
=>
{
...
...
@@ -1028,30 +1026,10 @@ export class Workbench extends Disposable implements IPartService {
}
else
{
this
.
workbenchGrid
=
new
SerializableGrid
(
this
.
editorPart
,
{
proportionalLayout
:
false
});
const
sidebarDirection
=
this
.
sideBarPosition
===
Position
.
RIGHT
?
Direction
.
Right
:
Direction
.
Left
;
if
(
!
this
.
statusBarHidden
)
{
this
.
workbenchGrid
.
addView
(
this
.
statusbarPart
,
Sizing
.
Split
,
this
.
editorPart
,
Direction
.
Down
);
}
if
(
this
.
useCustomTitleBarStyle
)
{
this
.
workbenchGrid
.
addView
(
this
.
titlebarPart
,
Sizing
.
Split
,
this
.
editorPart
,
Direction
.
Up
);
}
if
(
!
this
.
activityBarHidden
)
{
this
.
workbenchGrid
.
addView
(
this
.
activitybarPart
,
Sizing
.
Split
,
this
.
editorPart
,
sidebarDirection
);
}
if
(
!
this
.
sideBarHidden
)
{
this
.
workbenchGrid
.
addView
(
this
.
sidebarPart
,
Sizing
.
Split
,
this
.
editorPart
,
sidebarDirection
);
}
if
(
!
this
.
panelHidden
)
{
this
.
workbenchGrid
.
addView
(
this
.
panelPart
,
Sizing
.
Split
,
this
.
editorPart
,
this
.
panelPosition
===
Position
.
BOTTOM
?
Direction
.
Down
:
Direction
.
Right
);
}
}
this
.
workbench
.
appendChild
(
this
.
workbenchGrid
.
element
);
this
.
updateGrid
();
this
.
workbench
.
prepend
(
this
.
workbenchGrid
.
element
);
}
else
{
this
.
workbenchGrid
=
this
.
instantiationService
.
createInstance
(
WorkbenchLayout
,
...
...
@@ -1159,9 +1137,11 @@ export class Workbench extends Disposable implements IPartService {
part
.
id
=
id
;
part
.
setAttribute
(
'
role
'
,
role
);
// Insert all workbench parts at the beginning. Issue #52531
// This is primarily for the title bar to allow overriding -webkit-app-region
this
.
workbench
.
insertBefore
(
part
,
this
.
workbench
.
lastChild
);
if
(
!
this
.
configurationService
.
getValue
(
'
workbench.useExperimentalGridLayout
'
))
{
// Insert all workbench parts at the beginning. Issue #52531
// This is primarily for the title bar to allow overriding -webkit-app-region
this
.
workbench
.
insertBefore
(
part
,
this
.
workbench
.
lastChild
);
}
return
part
;
}
...
...
@@ -1442,7 +1422,7 @@ export class Workbench extends Disposable implements IPartService {
statusBarInGrid
=
false
;
}
if
(
this
.
titleBarHidden
&&
titlebarInGrid
)
{
if
(
!
this
.
isVisible
(
Parts
.
TITLEBAR_PART
)
&&
titlebarInGrid
)
{
this
.
workbenchGrid
.
removeView
(
this
.
titlebarPart
);
titlebarInGrid
=
false
;
}
...
...
@@ -1482,7 +1462,7 @@ export class Workbench extends Disposable implements IPartService {
statusBarInGrid
=
true
;
}
if
(
!
this
.
titleBarHidden
&&
!
titlebarInGrid
)
{
if
(
this
.
isVisible
(
Parts
.
TITLEBAR_PART
)
&&
!
titlebarInGrid
)
{
if
(
sidebarInGrid
)
{
this
.
uiState
.
lastSidebarDimension
=
this
.
workbenchGrid
.
getViewSize
(
this
.
sidebarPart
);
this
.
workbenchGrid
.
removeView
(
this
.
sidebarPart
);
...
...
@@ -1541,8 +1521,6 @@ export class Workbench extends Disposable implements IPartService {
DOM
.
position
(
this
.
workbench
,
0
,
0
,
0
,
0
,
'
relative
'
);
DOM
.
size
(
this
.
workbench
,
dimensions
.
width
,
dimensions
.
height
);
this
.
titleBarHidden
=
browser
.
isFullscreen
()
&&
(
this
.
getMenubarVisibility
()
===
'
default
'
||
(
this
.
getMenubarVisibility
()
===
'
toggle
'
&&
!
this
.
menubarToggled
));
this
.
updateGrid
();
this
.
workbenchGrid
.
layout
(
dimensions
.
width
,
dimensions
.
height
);
}
else
{
...
...
@@ -1551,10 +1529,6 @@ export class Workbench extends Disposable implements IPartService {
}
}
setTitlebarVisibility
(
visible
:
boolean
):
void
{
this
.
titleBarHidden
=
visible
;
}
isEditorLayoutCentered
():
boolean
{
return
this
.
shouldCenterLayout
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录