Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
1a1b92fb
V
vscode
项目概览
掘金者说
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
1a1b92fb
编写于
8月 03, 2018
作者:
S
SteVen Batten
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
don't display fallback menu unless we've closed the last window
上级
1e45ce6a
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
15 addition
and
10 deletion
+15
-10
src/vs/code/electron-main/menubar.ts
src/vs/code/electron-main/menubar.ts
+14
-7
src/vs/platform/actions/common/actions.ts
src/vs/platform/actions/common/actions.ts
+0
-1
src/vs/workbench/browser/parts/menubar/menubarPart.ts
src/vs/workbench/browser/parts/menubar/menubarPart.ts
+1
-2
未找到文件。
src/vs/code/electron-main/menubar.ts
浏览文件 @
1a1b92fb
...
...
@@ -31,12 +31,13 @@ export class Menubar {
private
static
readonly
MAX_MENU_RECENT_ENTRIES
=
10
;
private
isQuitting
:
boolean
;
private
appMenuInstalled
:
boolean
;
private
closedLastWindow
:
boolean
;
private
menuUpdater
:
RunOnceScheduler
;
private
nativeTabMenuItems
:
Electron
.
MenuItem
[];
private
menubarMenus
:
IMenubarData
=
{}
;
private
menubarMenus
:
IMenubarData
;
private
keybindings
:
{
[
commandId
:
string
]:
IMenubarKeybinding
};
...
...
@@ -54,6 +55,8 @@ export class Menubar {
this
.
keybindings
=
Object
.
create
(
null
);
this
.
closedLastWindow
=
false
;
this
.
install
();
this
.
registerListeners
();
...
...
@@ -149,9 +152,9 @@ export class Menubar {
return
;
}
// Update menu if window count goes from N > 0 or 0 > N to update menu item enablement
if
((
e
.
oldCount
===
0
&&
e
.
newCount
>
0
)
||
(
e
.
oldCount
>
0
&&
e
.
newCount
===
0
))
{
this
.
closedLastWindow
=
e
.
newCount
===
0
;
this
.
scheduleUpdateMenu
();
}
...
...
@@ -379,18 +382,22 @@ export class Menubar {
switch
(
menuId
)
{
case
'
File
'
:
case
'
Window
'
:
case
'
Help
'
:
if
(
isMacintosh
)
{
return
this
.
windowsMainService
.
getWindowCount
()
===
0
||
!!
this
.
menubarMenus
[
menuId
];
return
(
this
.
windowsMainService
.
getWindowCount
()
===
0
&&
this
.
closedLastWindow
)
||
(
!!
this
.
menubarMenus
&&
!!
this
.
menubarMenus
[
menuId
]);
}
break
;
case
'
Window
'
:
if
(
isMacintosh
)
{
return
(
this
.
windowsMainService
.
getWindowCount
()
===
0
&&
this
.
closedLastWindow
)
||
!!
this
.
menubarMenus
;
}
default
:
return
this
.
windowsMainService
.
getWindowCount
()
>
0
&&
!!
this
.
menubarMenus
[
menuId
]
;
return
this
.
windowsMainService
.
getWindowCount
()
>
0
&&
(
!!
this
.
menubarMenus
&&
!!
this
.
menubarMenus
[
menuId
])
;
}
}
private
shouldFallback
(
menuId
:
string
):
boolean
{
return
this
.
shouldDrawMenu
(
menuId
)
&&
(
this
.
windowsMainService
.
getWindowCount
()
===
0
&&
isMacintosh
);
return
this
.
shouldDrawMenu
(
menuId
)
&&
(
this
.
windowsMainService
.
getWindowCount
()
===
0
&&
this
.
closedLastWindow
&&
isMacintosh
);
}
private
setFallbackMenuById
(
menu
:
Electron
.
Menu
,
menuId
:
string
):
void
{
...
...
@@ -520,7 +527,7 @@ export class Menubar {
}
private
setMenuById
(
menu
:
Electron
.
Menu
,
menuId
:
string
):
void
{
if
(
this
.
menubarMenus
[
menuId
])
{
if
(
this
.
menubarMenus
&&
this
.
menubarMenus
[
menuId
])
{
this
.
setMenu
(
menu
,
this
.
menubarMenus
[
menuId
].
items
);
}
}
...
...
src/vs/platform/actions/common/actions.ts
浏览文件 @
1a1b92fb
...
...
@@ -98,7 +98,6 @@ export class MenuId {
static
readonly
MenubarDebugMenu
=
new
MenuId
();
static
readonly
MenubarNewBreakpointMenu
=
new
MenuId
();
static
readonly
MenubarTasksMenu
=
new
MenuId
();
static
readonly
MenubarWindowMenu
=
new
MenuId
();
static
readonly
MenubarPreferencesMenu
=
new
MenuId
();
static
readonly
MenubarHelpMenu
=
new
MenuId
();
static
readonly
MenubarTerminalMenu
=
new
MenuId
();
...
...
src/vs/workbench/browser/parts/menubar/menubarPart.ts
浏览文件 @
1a1b92fb
...
...
@@ -62,7 +62,7 @@ export class MenubarPart extends Part {
'
workbench.statusBar.visible
'
,
'
workbench.activityBar.visible
'
,
'
window.enableMenuBarMnemonics
'
,
//
'window.nativeTabs'
'
window.nativeTabs
'
];
private
topLevelMenus
:
{
...
...
@@ -143,7 +143,6 @@ export class MenubarPart extends Part {
if
(
isMacintosh
)
{
this
.
topLevelMenus
[
'
Preferences
'
]
=
this
.
_register
(
this
.
menuService
.
createMenu
(
MenuId
.
MenubarPreferencesMenu
,
this
.
contextKeyService
));
this
.
topLevelMenus
[
'
Window
'
]
=
this
.
_register
(
this
.
menuService
.
createMenu
(
MenuId
.
MenubarWindowMenu
,
this
.
contextKeyService
));
}
this
.
menuUpdater
=
this
.
_register
(
new
RunOnceScheduler
(()
=>
this
.
doSetupMenubar
(),
100
));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录