Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
d0d8929d
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,发现更多精彩内容 >>
提交
d0d8929d
编写于
6月 11, 2018
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix #46818
上级
4132c13a
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
35 addition
and
10 deletion
+35
-10
src/vs/code/electron-main/auth.ts
src/vs/code/electron-main/auth.ts
+4
-1
src/vs/code/electron-main/launch.ts
src/vs/code/electron-main/launch.ts
+19
-6
src/vs/code/electron-main/menus.ts
src/vs/code/electron-main/menus.ts
+4
-1
src/vs/platform/issue/electron-main/issueService.ts
src/vs/platform/issue/electron-main/issueService.ts
+8
-2
未找到文件。
src/vs/code/electron-main/auth.ts
浏览文件 @
d0d8929d
...
...
@@ -56,7 +56,10 @@ export class ProxyAuthHandler {
width
:
450
,
height
:
220
,
show
:
true
,
title
:
'
VS Code
'
title
:
'
VS Code
'
,
webPreferences
:
{
disableBlinkFeatures
:
'
Auxclick
'
}
};
const
focusedWindow
=
this
.
windowsMainService
.
getFocusedWindow
();
...
...
src/vs/code/electron-main/launch.ts
浏览文件 @
d0d8929d
...
...
@@ -19,6 +19,7 @@ import { IWorkspacesMainService } from 'vs/platform/workspaces/common/workspaces
import
{
Schemas
}
from
'
vs/base/common/network
'
;
import
{
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
import
URI
from
'
vs/base/common/uri
'
;
import
{
BrowserWindow
}
from
'
electron
'
;
export
const
ID
=
'
launchService
'
;
export
const
ILaunchService
=
createDecorator
<
ILaunchService
>
(
ID
);
...
...
@@ -245,12 +246,20 @@ export class LaunchService implements ILaunchService {
public
getMainProcessInfo
():
TPromise
<
IMainProcessInfo
>
{
this
.
logService
.
trace
(
'
Received request for main process info from other instance.
'
);
const
windows
:
IWindowInfo
[]
=
[];
BrowserWindow
.
getAllWindows
().
forEach
(
window
=>
{
const
codeWindow
=
this
.
windowsMainService
.
getWindowById
(
window
.
id
);
if
(
codeWindow
)
{
windows
.
push
(
this
.
codeWindowToInfo
(
codeWindow
));
}
else
{
windows
.
push
(
this
.
browserWindowToInfo
(
window
));
}
});
return
TPromise
.
wrap
({
mainPID
:
process
.
pid
,
mainArguments
:
process
.
argv
,
windows
:
this
.
windowsMainService
.
getWindows
().
map
(
window
=>
{
return
this
.
getWindowInfo
(
window
);
})
windows
}
as
IMainProcessInfo
);
}
...
...
@@ -260,7 +269,7 @@ export class LaunchService implements ILaunchService {
return
TPromise
.
as
(
this
.
environmentService
.
logsPath
);
}
private
getWindow
Info
(
window
:
ICodeWindow
):
IWindowInfo
{
private
codeWindowTo
Info
(
window
:
ICodeWindow
):
IWindowInfo
{
const
folders
:
string
[]
=
[];
if
(
window
.
openedFolderPath
)
{
...
...
@@ -274,9 +283,13 @@ export class LaunchService implements ILaunchService {
});
}
return
this
.
browserWindowToInfo
(
window
.
win
,
folders
);
}
private
browserWindowToInfo
(
win
:
BrowserWindow
,
folders
:
string
[]
=
[]):
IWindowInfo
{
return
{
pid
:
win
dow
.
win
.
webContents
.
getOSProcessId
(),
title
:
win
dow
.
win
.
getTitle
(),
pid
:
win
.
webContents
.
getOSProcessId
(),
title
:
win
.
getTitle
(),
folders
}
as
IWindowInfo
;
}
...
...
src/vs/code/electron-main/menus.ts
浏览文件 @
d0d8929d
...
...
@@ -1137,7 +1137,10 @@ export class CodeMenu {
width
:
450
,
height
:
300
,
show
:
true
,
title
:
nls
.
localize
(
'
accessibilityOptionsWindowTitle
'
,
"
Accessibility Options
"
)
title
:
nls
.
localize
(
'
accessibilityOptionsWindowTitle
'
,
"
Accessibility Options
"
),
webPreferences
:
{
disableBlinkFeatures
:
'
Auxclick
'
}
});
win
.
setMenuBarVisibility
(
false
);
...
...
src/vs/platform/issue/electron-main/issueService.ts
浏览文件 @
d0d8929d
...
...
@@ -61,7 +61,10 @@ export class IssueService implements IIssueService {
x
:
position
.
x
,
y
:
position
.
y
,
title
:
localize
(
'
issueReporter
'
,
"
Issue Reporter
"
),
backgroundColor
:
data
.
styles
.
backgroundColor
||
DEFAULT_BACKGROUND_COLOR
backgroundColor
:
data
.
styles
.
backgroundColor
||
DEFAULT_BACKGROUND_COLOR
,
webPreferences
:
{
disableBlinkFeatures
:
'
Auxclick
'
}
});
this
.
_issueWindow
.
setMenuBarVisibility
(
false
);
// workaround for now, until a menu is implemented
...
...
@@ -106,7 +109,10 @@ export class IssueService implements IIssueService {
x
:
position
.
x
,
y
:
position
.
y
,
backgroundColor
:
data
.
styles
.
backgroundColor
,
title
:
localize
(
'
processExplorer
'
,
"
Process Explorer
"
)
title
:
localize
(
'
processExplorer
'
,
"
Process Explorer
"
),
webPreferences
:
{
disableBlinkFeatures
:
'
Auxclick
'
}
});
this
.
_processExplorerWindow
.
setMenuBarVisibility
(
false
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录