Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
5c565a14
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,体验更适合开发者的 AI 搜索 >>
提交
5c565a14
编写于
12月 11, 2019
作者:
S
SteVen Batten
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fixes #85304
上级
26a8754f
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
6 addition
and
5 deletion
+6
-5
src/vs/platform/windows/common/windows.ts
src/vs/platform/windows/common/windows.ts
+1
-1
src/vs/platform/windows/electron-main/windowsMainService.ts
src/vs/platform/windows/electron-main/windowsMainService.ts
+3
-3
src/vs/workbench/electron-browser/desktop.contribution.ts
src/vs/workbench/electron-browser/desktop.contribution.ts
+2
-1
未找到文件。
src/vs/platform/windows/common/windows.ts
浏览文件 @
5c565a14
...
@@ -91,7 +91,7 @@ export interface IWindowSettings {
...
@@ -91,7 +91,7 @@ export interface IWindowSettings {
titleBarStyle
:
'
native
'
|
'
custom
'
;
titleBarStyle
:
'
native
'
|
'
custom
'
;
autoDetectHighContrast
:
boolean
;
autoDetectHighContrast
:
boolean
;
menuBarVisibility
:
MenuBarVisibility
;
menuBarVisibility
:
MenuBarVisibility
;
newWindowDimensions
:
'
default
'
|
'
inherit
'
|
'
maximized
'
|
'
fullscreen
'
;
newWindowDimensions
:
'
default
'
|
'
inherit
'
|
'
offset
'
|
'
maximized
'
|
'
fullscreen
'
;
nativeTabs
:
boolean
;
nativeTabs
:
boolean
;
nativeFullScreen
:
boolean
;
nativeFullScreen
:
boolean
;
enableMenuBarMnemonics
:
boolean
;
enableMenuBarMnemonics
:
boolean
;
...
...
src/vs/platform/windows/electron-main/windowsMainService.ts
浏览文件 @
5c565a14
...
@@ -1381,7 +1381,7 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
...
@@ -1381,7 +1381,7 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
// Window state is not from a previous session: only allow fullscreen if we inherit it or user wants fullscreen
// Window state is not from a previous session: only allow fullscreen if we inherit it or user wants fullscreen
let
allowFullscreen
:
boolean
;
let
allowFullscreen
:
boolean
;
if
(
state
.
hasDefaultState
)
{
if
(
state
.
hasDefaultState
)
{
allowFullscreen
=
(
windowConfig
?.
newWindowDimensions
&&
[
'
fullscreen
'
,
'
inherit
'
].
indexOf
(
windowConfig
.
newWindowDimensions
)
>=
0
);
allowFullscreen
=
(
windowConfig
?.
newWindowDimensions
&&
[
'
fullscreen
'
,
'
inherit
'
,
'
offset
'
].
indexOf
(
windowConfig
.
newWindowDimensions
)
>=
0
);
}
}
// Window state is from a previous session: only allow fullscreen when we got updated or user wants to restore
// Window state is from a previous session: only allow fullscreen when we got updated or user wants to restore
...
@@ -1576,7 +1576,7 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
...
@@ -1576,7 +1576,7 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
}
else
if
(
windowConfig
.
newWindowDimensions
===
'
fullscreen
'
)
{
}
else
if
(
windowConfig
.
newWindowDimensions
===
'
fullscreen
'
)
{
state
.
mode
=
WindowMode
.
Fullscreen
;
state
.
mode
=
WindowMode
.
Fullscreen
;
ensureNoOverlap
=
false
;
ensureNoOverlap
=
false
;
}
else
if
(
windowConfig
.
newWindowDimensions
===
'
inherit
'
&&
lastActive
)
{
}
else
if
(
(
windowConfig
.
newWindowDimensions
===
'
inherit
'
||
windowConfig
.
newWindowDimensions
===
'
offset
'
)
&&
lastActive
)
{
const
lastActiveState
=
lastActive
.
serializeWindowState
();
const
lastActiveState
=
lastActive
.
serializeWindowState
();
if
(
lastActiveState
.
mode
===
WindowMode
.
Fullscreen
)
{
if
(
lastActiveState
.
mode
===
WindowMode
.
Fullscreen
)
{
state
.
mode
=
WindowMode
.
Fullscreen
;
// only take mode (fixes https://github.com/Microsoft/vscode/issues/19331)
state
.
mode
=
WindowMode
.
Fullscreen
;
// only take mode (fixes https://github.com/Microsoft/vscode/issues/19331)
...
@@ -1584,7 +1584,7 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
...
@@ -1584,7 +1584,7 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
state
=
lastActiveState
;
state
=
lastActiveState
;
}
}
ensureNoOverlap
=
false
;
ensureNoOverlap
=
state
.
mode
!==
WindowMode
.
Fullscreen
&&
windowConfig
.
newWindowDimensions
===
'
offset
'
;
}
}
}
}
...
...
src/vs/workbench/electron-browser/desktop.contribution.ts
浏览文件 @
5c565a14
...
@@ -256,10 +256,11 @@ import product from 'vs/platform/product/common/product';
...
@@ -256,10 +256,11 @@ import product from 'vs/platform/product/common/product';
},
},
'
window.newWindowDimensions
'
:
{
'
window.newWindowDimensions
'
:
{
'
type
'
:
'
string
'
,
'
type
'
:
'
string
'
,
'
enum
'
:
[
'
default
'
,
'
inherit
'
,
'
maximized
'
,
'
fullscreen
'
],
'
enum
'
:
[
'
default
'
,
'
inherit
'
,
'
offset
'
,
'
maximized
'
,
'
fullscreen
'
],
'
enumDescriptions
'
:
[
'
enumDescriptions
'
:
[
nls
.
localize
(
'
window.newWindowDimensions.default
'
,
"
Open new windows in the center of the screen.
"
),
nls
.
localize
(
'
window.newWindowDimensions.default
'
,
"
Open new windows in the center of the screen.
"
),
nls
.
localize
(
'
window.newWindowDimensions.inherit
'
,
"
Open new windows with same dimension as last active one.
"
),
nls
.
localize
(
'
window.newWindowDimensions.inherit
'
,
"
Open new windows with same dimension as last active one.
"
),
nls
.
localize
(
'
window.newWindowDimensions.offset
'
,
"
Open new windows with same dimension as last active one with an offset position.
"
),
nls
.
localize
(
'
window.newWindowDimensions.maximized
'
,
"
Open new windows maximized.
"
),
nls
.
localize
(
'
window.newWindowDimensions.maximized
'
,
"
Open new windows maximized.
"
),
nls
.
localize
(
'
window.newWindowDimensions.fullscreen
'
,
"
Open new windows in full screen mode.
"
)
nls
.
localize
(
'
window.newWindowDimensions.fullscreen
'
,
"
Open new windows in full screen mode.
"
)
],
],
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录