Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
3e373312
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,发现更多精彩内容 >>
提交
3e373312
编写于
1月 06, 2017
作者:
D
David Terry
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
menubar visibility is updated from within each window, rather than from outside
上级
90857a57
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
20 addition
and
20 deletion
+20
-20
src/vs/code/electron-main/window.ts
src/vs/code/electron-main/window.ts
+20
-1
src/vs/code/electron-main/windows.ts
src/vs/code/electron-main/windows.ts
+0
-19
未找到文件。
src/vs/code/electron-main/window.ts
浏览文件 @
3e373312
...
...
@@ -117,6 +117,12 @@ export enum ReadyState {
READY
}
interface
IConfiguration
{
window
:
{
menuBarVisibility
:
'
visible
'
|
'
toggle
'
|
'
hidden
'
;
};
}
export
interface
IVSCodeWindow
{
id
:
number
;
readyState
:
ReadyState
;
...
...
@@ -142,6 +148,7 @@ export class VSCodeWindow implements IVSCodeWindow {
private
_extensionDevelopmentPath
:
string
;
private
_isExtensionTestHost
:
boolean
;
private
windowState
:
IWindowState
;
private
currentMenuBarVisibility
:
''
|
'
visible
'
|
'
toggle
'
|
'
hidden
'
;
private
currentWindowMode
:
WindowMode
;
private
whenReadyCallbacks
:
TValueCallback
<
VSCodeWindow
>
[];
...
...
@@ -239,8 +246,20 @@ export class VSCodeWindow implements IVSCodeWindow {
this
.
setMenuBarVisibility
(
windowConfig
&&
windowConfig
.
menuBarVisibility
);
this
.
registerListeners
();
this
.
configurationService
.
onDidUpdateConfiguration
(
e
=>
this
.
onConfigurationUpdated
(
e
.
config
));
}
private
onConfigurationUpdated
(
config
:
IConfiguration
):
void
{
let
newMenuBarVisibility
=
config
&&
config
.
window
&&
config
.
window
.
menuBarVisibility
;
if
(
newMenuBarVisibility
!==
this
.
currentMenuBarVisibility
)
{
this
.
currentMenuBarVisibility
=
newMenuBarVisibility
;
this
.
setMenuBarVisibility
(
newMenuBarVisibility
);
}
};
public
hasHiddenTitleBarStyle
():
boolean
{
return
this
.
hiddenTitleBarStyle
;
}
...
...
@@ -656,7 +675,7 @@ export class VSCodeWindow implements IVSCodeWindow {
const
windowConfig
=
this
.
configurationService
.
getConfiguration
<
IWindowSettings
>
(
'
window
'
);
let
menuBarVisibility
=
windowConfig
&&
windowConfig
.
menuBarVisibility
;
if
(
typeof
menuBarVisibility
!==
'
string
'
)
{
menuBarVisibility
=
'
togg
le
'
;
menuBarVisibility
=
willBeFullScreen
?
'
toggle
'
:
'
visib
le
'
;
};
this
.
setMenuBarVisibility
(
menuBarVisibility
,
false
);
...
...
src/vs/code/electron-main/windows.ts
浏览文件 @
3e373312
...
...
@@ -90,12 +90,6 @@ interface INativeOpenDialogOptions {
window
?:
VSCodeWindow
;
}
interface
IConfiguration
{
window
:
{
menuBarVisibility
:
'
visible
'
|
'
toggle
'
|
'
hidden
'
;
};
}
const
ReopenFoldersSetting
=
{
ALL
:
'
all
'
,
ONE
:
'
one
'
,
...
...
@@ -154,7 +148,6 @@ export class WindowsManager implements IWindowsMainService {
private
initialUserEnv
:
platform
.
IProcessEnvironment
;
private
windowsState
:
IWindowsState
;
private
currentMenuBarVisibility
:
''
|
'
visible
'
|
'
toggle
'
|
'
hidden
'
;
private
_onRecentPathsChange
=
new
Emitter
<
void
>
();
onRecentPathsChange
:
CommonEvent
<
void
>
=
this
.
_onRecentPathsChange
.
event
;
...
...
@@ -282,20 +275,8 @@ export class WindowsManager implements IWindowsMainService {
// Update jump list when recent paths change
this
.
onRecentPathsChange
(()
=>
this
.
updateWindowsJumpList
());
this
.
configurationService
.
onDidUpdateConfiguration
(
e
=>
this
.
onConfigurationUpdated
(
e
.
config
));
}
private
onConfigurationUpdated
(
config
:
IConfiguration
):
void
{
let
newMenuBarVisibility
=
config
&&
config
.
window
&&
config
.
window
.
menuBarVisibility
;
if
(
newMenuBarVisibility
!==
this
.
currentMenuBarVisibility
)
{
this
.
currentMenuBarVisibility
=
newMenuBarVisibility
;
this
.
getWindows
().
forEach
(
w
=>
w
.
setMenuBarVisibility
(
newMenuBarVisibility
));
}
};
private
onBroadcast
(
event
:
string
,
payload
:
any
):
void
{
// Theme changes
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录