Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
ce94c833
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,发现更多精彩内容 >>
提交
ce94c833
编写于
6月 11, 2019
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
workaround #74872
上级
3e99f28e
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
25 addition
and
7 deletion
+25
-7
src/vs/code/electron-main/window.ts
src/vs/code/electron-main/window.ts
+25
-7
未找到文件。
src/vs/code/electron-main/window.ts
浏览文件 @
ce94c833
...
@@ -113,7 +113,8 @@ export class CodeWindow extends Disposable implements ICodeWindow {
...
@@ -113,7 +113,8 @@ export class CodeWindow extends Disposable implements ICodeWindow {
private
createBrowserWindow
(
config
:
IWindowCreationOptions
):
void
{
private
createBrowserWindow
(
config
:
IWindowCreationOptions
):
void
{
// Load window state
// Load window state
this
.
windowState
=
this
.
restoreWindowState
(
config
.
state
);
const
[
state
,
hasMultipleDisplays
]
=
this
.
restoreWindowState
(
config
.
state
);
this
.
windowState
=
state
;
// in case we are maximized or fullscreen, only show later after the call to maximize/fullscreen (see below)
// in case we are maximized or fullscreen, only show later after the call to maximize/fullscreen (see below)
const
isFullscreenOrMaximized
=
(
this
.
windowState
.
mode
===
WindowMode
.
Maximized
||
this
.
windowState
.
mode
===
WindowMode
.
Fullscreen
);
const
isFullscreenOrMaximized
=
(
this
.
windowState
.
mode
===
WindowMode
.
Maximized
||
this
.
windowState
.
mode
===
WindowMode
.
Fullscreen
);
...
@@ -176,6 +177,20 @@ export class CodeWindow extends Disposable implements ICodeWindow {
...
@@ -176,6 +177,20 @@ export class CodeWindow extends Disposable implements ICodeWindow {
this
.
_win
.
setSheetOffset
(
22
);
// offset dialogs by the height of the custom title bar if we have any
this
.
_win
.
setSheetOffset
(
22
);
// offset dialogs by the height of the custom title bar if we have any
}
}
// TODO@Ben (Electron 4 regression): when running on multiple displays where the target display
// to open the window has a larger resolution than the primary display, the window will not size
// correctly unless we set the bounds again (https://github.com/microsoft/vscode/issues/74872)
if
(
isMacintosh
&&
hasMultipleDisplays
)
{
if
([
this
.
windowState
.
width
,
this
.
windowState
.
height
,
this
.
windowState
.
x
,
this
.
windowState
.
y
].
every
(
value
=>
typeof
value
===
'
number
'
))
{
this
.
_win
.
setBounds
({
width
:
this
.
windowState
.
width
!
,
height
:
this
.
windowState
.
height
!
,
x
:
this
.
windowState
.
x
!
,
y
:
this
.
windowState
.
y
!
});
}
}
if
(
isFullscreenOrMaximized
)
{
if
(
isFullscreenOrMaximized
)
{
this
.
_win
.
maximize
();
this
.
_win
.
maximize
();
...
@@ -679,18 +694,23 @@ export class CodeWindow extends Disposable implements ICodeWindow {
...
@@ -679,18 +694,23 @@ export class CodeWindow extends Disposable implements ICodeWindow {
return
state
;
return
state
;
}
}
private
restoreWindowState
(
state
?:
IWindowState
):
IWindowState
{
private
restoreWindowState
(
state
?:
IWindowState
):
[
IWindowState
,
boolean
?
/* has multiple displays */
]
{
let
hasMultipleDisplays
=
false
;
if
(
state
)
{
if
(
state
)
{
try
{
try
{
state
=
this
.
validateWindowState
(
state
);
const
displays
=
screen
.
getAllDisplays
();
hasMultipleDisplays
=
displays
.
length
>
1
;
state
=
this
.
validateWindowState
(
state
,
displays
);
}
catch
(
err
)
{
}
catch
(
err
)
{
this
.
logService
.
warn
(
`Unexpected error validating window state:
${
err
}
\n
${
err
.
stack
}
`
);
// somehow display API can be picky about the state to validate
this
.
logService
.
warn
(
`Unexpected error validating window state:
${
err
}
\n
${
err
.
stack
}
`
);
// somehow display API can be picky about the state to validate
}
}
}
}
return
state
||
defaultWindowState
();
return
[
state
||
defaultWindowState
(),
hasMultipleDisplays
];
}
}
private
validateWindowState
(
state
:
IWindowState
):
IWindowState
|
undefined
{
private
validateWindowState
(
state
:
IWindowState
,
displays
:
Display
[]
):
IWindowState
|
undefined
{
if
(
typeof
state
.
x
!==
'
number
'
if
(
typeof
state
.
x
!==
'
number
'
||
typeof
state
.
y
!==
'
number
'
||
typeof
state
.
y
!==
'
number
'
||
typeof
state
.
width
!==
'
number
'
||
typeof
state
.
width
!==
'
number
'
...
@@ -703,8 +723,6 @@ export class CodeWindow extends Disposable implements ICodeWindow {
...
@@ -703,8 +723,6 @@ export class CodeWindow extends Disposable implements ICodeWindow {
return
undefined
;
return
undefined
;
}
}
const
displays
=
screen
.
getAllDisplays
();
// Single Monitor: be strict about x/y positioning
// Single Monitor: be strict about x/y positioning
if
(
displays
.
length
===
1
)
{
if
(
displays
.
length
===
1
)
{
const
displayWorkingArea
=
this
.
getWorkingArea
(
displays
[
0
]);
const
displayWorkingArea
=
this
.
getWorkingArea
(
displays
[
0
]);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录