Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
4f04524f
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,发现更多精彩内容 >>
提交
4f04524f
编写于
9月 19, 2019
作者:
I
isidor
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
do not inline touchbar icons - does not work
fixes #81111
上级
78f9269d
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
12 addition
and
11 deletion
+12
-11
src/vs/base/common/amd.ts
src/vs/base/common/amd.ts
+1
-0
src/vs/workbench/browser/parts/editor/editor.contribution.ts
src/vs/workbench/browser/parts/editor/editor.contribution.ts
+2
-2
src/vs/workbench/contrib/debug/browser/debug.contribution.ts
src/vs/workbench/contrib/debug/browser/debug.contribution.ts
+9
-9
未找到文件。
src/vs/base/common/amd.ts
浏览文件 @
4f04524f
...
...
@@ -11,6 +11,7 @@ export function getPathFromAmdModule(requirefn: typeof require, relativePath: st
/**
* Reference a resource that might be inlined.
* Do not inline icons that will be used by the native mac touchbar.
* Do not rename this method unless you adopt the build scripts.
*/
export
function
registerAndGetAmdImageURL
(
absolutePath
:
string
):
string
{
...
...
src/vs/workbench/browser/parts/editor/editor.contribution.ts
浏览文件 @
4f04524f
...
...
@@ -413,12 +413,12 @@ editorCommands.setup();
// Touch Bar
if
(
isMacintosh
)
{
MenuRegistry
.
appendMenuItem
(
MenuId
.
TouchBarContext
,
{
command
:
{
id
:
NavigateBackwardsAction
.
ID
,
title
:
NavigateBackwardsAction
.
LABEL
,
iconLocation
:
{
dark
:
URI
.
parse
(
re
gisterAndGetAmdImageURL
(
'
vs/workbench/browser/parts/editor/media/back-tb.png
'
))
}
},
command
:
{
id
:
NavigateBackwardsAction
.
ID
,
title
:
NavigateBackwardsAction
.
LABEL
,
iconLocation
:
{
dark
:
URI
.
parse
(
re
quire
.
toUrl
(
'
vs/workbench/browser/parts/editor/media/back-tb.png
'
))
}
},
group
:
'
navigation
'
});
MenuRegistry
.
appendMenuItem
(
MenuId
.
TouchBarContext
,
{
command
:
{
id
:
NavigateForwardAction
.
ID
,
title
:
NavigateForwardAction
.
LABEL
,
iconLocation
:
{
dark
:
URI
.
parse
(
re
gisterAndGetAmdImageURL
(
'
vs/workbench/browser/parts/editor/media/forward-tb.png
'
))
}
},
command
:
{
id
:
NavigateForwardAction
.
ID
,
title
:
NavigateForwardAction
.
LABEL
,
iconLocation
:
{
dark
:
URI
.
parse
(
re
quire
.
toUrl
(
'
vs/workbench/browser/parts/editor/media/forward-tb.png
'
))
}
},
group
:
'
navigation
'
});
}
...
...
src/vs/workbench/contrib/debug/browser/debug.contribution.ts
浏览文件 @
4f04524f
...
...
@@ -551,13 +551,13 @@ if (isMacintosh) {
});
};
registerTouchBarEntry
(
StartAction
.
ID
,
StartAction
.
LABEL
,
0
,
CONTEXT_IN_DEBUG_MODE
.
toNegated
(),
URI
.
parse
(
re
gisterAndGetAmdImageURL
(
'
vs/workbench/contrib/debug/browser/media/continue-tb.png
'
)));
registerTouchBarEntry
(
RunAction
.
ID
,
RunAction
.
LABEL
,
1
,
CONTEXT_IN_DEBUG_MODE
.
toNegated
(),
URI
.
parse
(
re
gisterAndGetAmdImageURL
(
'
vs/workbench/contrib/debug/browser/media/continue-without-debugging-tb.png
'
)));
registerTouchBarEntry
(
CONTINUE_ID
,
CONTINUE_LABEL
,
0
,
CONTEXT_DEBUG_STATE
.
isEqualTo
(
'
stopped
'
),
URI
.
parse
(
re
gisterAndGetAmdImageURL
(
'
vs/workbench/contrib/debug/browser/media/continue-tb.png
'
)));
registerTouchBarEntry
(
PAUSE_ID
,
PAUSE_LABEL
,
1
,
ContextKeyExpr
.
and
(
CONTEXT_IN_DEBUG_MODE
,
ContextKeyExpr
.
notEquals
(
'
debugState
'
,
'
stopped
'
)),
URI
.
parse
(
re
gisterAndGetAmdImageURL
(
'
vs/workbench/contrib/debug/browser/media/pause-tb.png
'
)));
registerTouchBarEntry
(
STEP_OVER_ID
,
STEP_OVER_LABEL
,
2
,
CONTEXT_IN_DEBUG_MODE
,
URI
.
parse
(
re
gisterAndGetAmdImageURL
(
'
vs/workbench/contrib/debug/browser/media/stepover-tb.png
'
)));
registerTouchBarEntry
(
STEP_INTO_ID
,
STEP_INTO_LABEL
,
3
,
CONTEXT_IN_DEBUG_MODE
,
URI
.
parse
(
re
gisterAndGetAmdImageURL
(
'
vs/workbench/contrib/debug/browser/media/stepinto-tb.png
'
)));
registerTouchBarEntry
(
STEP_OUT_ID
,
STEP_OUT_LABEL
,
4
,
CONTEXT_IN_DEBUG_MODE
,
URI
.
parse
(
re
gisterAndGetAmdImageURL
(
'
vs/workbench/contrib/debug/browser/media/stepout-tb.png
'
)));
registerTouchBarEntry
(
RESTART_SESSION_ID
,
RESTART_LABEL
,
5
,
CONTEXT_IN_DEBUG_MODE
,
URI
.
parse
(
re
gisterAndGetAmdImageURL
(
'
vs/workbench/contrib/debug/browser/media/restart-tb.png
'
)));
registerTouchBarEntry
(
STOP_ID
,
STOP_LABEL
,
6
,
CONTEXT_IN_DEBUG_MODE
,
URI
.
parse
(
re
gisterAndGetAmdImageURL
(
'
vs/workbench/contrib/debug/browser/media/stop-tb.png
'
)));
registerTouchBarEntry
(
StartAction
.
ID
,
StartAction
.
LABEL
,
0
,
CONTEXT_IN_DEBUG_MODE
.
toNegated
(),
URI
.
parse
(
re
quire
.
toUrl
(
'
vs/workbench/contrib/debug/browser/media/continue-tb.png
'
)));
registerTouchBarEntry
(
RunAction
.
ID
,
RunAction
.
LABEL
,
1
,
CONTEXT_IN_DEBUG_MODE
.
toNegated
(),
URI
.
parse
(
re
quire
.
toUrl
(
'
vs/workbench/contrib/debug/browser/media/continue-without-debugging-tb.png
'
)));
registerTouchBarEntry
(
CONTINUE_ID
,
CONTINUE_LABEL
,
0
,
CONTEXT_DEBUG_STATE
.
isEqualTo
(
'
stopped
'
),
URI
.
parse
(
re
quire
.
toUrl
(
'
vs/workbench/contrib/debug/browser/media/continue-tb.png
'
)));
registerTouchBarEntry
(
PAUSE_ID
,
PAUSE_LABEL
,
1
,
ContextKeyExpr
.
and
(
CONTEXT_IN_DEBUG_MODE
,
ContextKeyExpr
.
notEquals
(
'
debugState
'
,
'
stopped
'
)),
URI
.
parse
(
re
quire
.
toUrl
(
'
vs/workbench/contrib/debug/browser/media/pause-tb.png
'
)));
registerTouchBarEntry
(
STEP_OVER_ID
,
STEP_OVER_LABEL
,
2
,
CONTEXT_IN_DEBUG_MODE
,
URI
.
parse
(
re
quire
.
toUrl
(
'
vs/workbench/contrib/debug/browser/media/stepover-tb.png
'
)));
registerTouchBarEntry
(
STEP_INTO_ID
,
STEP_INTO_LABEL
,
3
,
CONTEXT_IN_DEBUG_MODE
,
URI
.
parse
(
re
quire
.
toUrl
(
'
vs/workbench/contrib/debug/browser/media/stepinto-tb.png
'
)));
registerTouchBarEntry
(
STEP_OUT_ID
,
STEP_OUT_LABEL
,
4
,
CONTEXT_IN_DEBUG_MODE
,
URI
.
parse
(
re
quire
.
toUrl
(
'
vs/workbench/contrib/debug/browser/media/stepout-tb.png
'
)));
registerTouchBarEntry
(
RESTART_SESSION_ID
,
RESTART_LABEL
,
5
,
CONTEXT_IN_DEBUG_MODE
,
URI
.
parse
(
re
quire
.
toUrl
(
'
vs/workbench/contrib/debug/browser/media/restart-tb.png
'
)));
registerTouchBarEntry
(
STOP_ID
,
STOP_LABEL
,
6
,
CONTEXT_IN_DEBUG_MODE
,
URI
.
parse
(
re
quire
.
toUrl
(
'
vs/workbench/contrib/debug/browser/media/stop-tb.png
'
)));
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录