Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
7bc12be7
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,发现更多精彩内容 >>
未验证
提交
7bc12be7
编写于
2月 14, 2020
作者:
J
João Moreno
提交者:
GitHub
2月 14, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fixes #90632 (#90675)
上级
8bac0089
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
52 addition
and
30 deletion
+52
-30
src/vs/workbench/contrib/update/browser/update.ts
src/vs/workbench/contrib/update/browser/update.ts
+32
-30
src/vs/workbench/services/host/browser/browserHostService.ts
src/vs/workbench/services/host/browser/browserHostService.ts
+4
-0
src/vs/workbench/services/host/browser/host.ts
src/vs/workbench/services/host/browser/host.ts
+5
-0
src/vs/workbench/services/host/electron-browser/desktopHostService.ts
...ench/services/host/electron-browser/desktopHostService.ts
+10
-0
src/vs/workbench/test/browser/workbenchTestServices.ts
src/vs/workbench/test/browser/workbenchTestServices.ts
+1
-0
未找到文件。
src/vs/workbench/contrib/update/browser/update.ts
浏览文件 @
7bc12be7
...
@@ -127,7 +127,8 @@ export class ProductContribution implements IWorkbenchContribution {
...
@@ -127,7 +127,8 @@ export class ProductContribution implements IWorkbenchContribution {
@
IHostService
hostService
:
IHostService
,
@
IHostService
hostService
:
IHostService
,
@
IProductService
productService
:
IProductService
@
IProductService
productService
:
IProductService
)
{
)
{
if
(
!
hostService
.
hasFocus
)
{
hostService
.
hadLastFocus
().
then
(
hadLastFocus
=>
{
if
(
!
hadLastFocus
)
{
return
;
return
;
}
}
...
@@ -160,6 +161,7 @@ export class ProductContribution implements IWorkbenchContribution {
...
@@ -160,6 +161,7 @@ export class ProductContribution implements IWorkbenchContribution {
}
}
storageService
.
store
(
ProductContribution
.
KEY
,
productService
.
version
,
StorageScope
.
GLOBAL
);
storageService
.
store
(
ProductContribution
.
KEY
,
productService
.
version
,
StorageScope
.
GLOBAL
);
});
}
}
}
}
...
...
src/vs/workbench/services/host/browser/browserHostService.ts
浏览文件 @
7bc12be7
...
@@ -95,6 +95,10 @@ export class BrowserHostService extends Disposable implements IHostService {
...
@@ -95,6 +95,10 @@ export class BrowserHostService extends Disposable implements IHostService {
return
document
.
hasFocus
();
return
document
.
hasFocus
();
}
}
async
hadLastFocus
():
Promise
<
boolean
>
{
return
true
;
}
async
focus
():
Promise
<
void
>
{
async
focus
():
Promise
<
void
>
{
window
.
focus
();
window
.
focus
();
}
}
...
...
src/vs/workbench/services/host/browser/host.ts
浏览文件 @
7bc12be7
...
@@ -25,6 +25,11 @@ export interface IHostService {
...
@@ -25,6 +25,11 @@ export interface IHostService {
*/
*/
readonly
hasFocus
:
boolean
;
readonly
hasFocus
:
boolean
;
/**
* Find out if the window had the last focus.
*/
hadLastFocus
():
Promise
<
boolean
>
;
/**
/**
* Attempt to bring the window to the foreground and focus it.
* Attempt to bring the window to the foreground and focus it.
*/
*/
...
...
src/vs/workbench/services/host/electron-browser/desktopHostService.ts
浏览文件 @
7bc12be7
...
@@ -36,6 +36,16 @@ export class DesktopHostService extends Disposable implements IHostService {
...
@@ -36,6 +36,16 @@ export class DesktopHostService extends Disposable implements IHostService {
return
document
.
hasFocus
();
return
document
.
hasFocus
();
}
}
async
hadLastFocus
():
Promise
<
boolean
>
{
const
activeWindowId
=
await
this
.
electronService
.
getActiveWindowId
();
if
(
typeof
activeWindowId
===
'
undefined
'
)
{
return
false
;
}
return
activeWindowId
===
this
.
electronEnvironmentService
.
windowId
;
}
openWindow
(
options
?:
IOpenEmptyWindowOptions
):
Promise
<
void
>
;
openWindow
(
options
?:
IOpenEmptyWindowOptions
):
Promise
<
void
>
;
openWindow
(
toOpen
:
IWindowOpenable
[],
options
?:
IOpenWindowOptions
):
Promise
<
void
>
;
openWindow
(
toOpen
:
IWindowOpenable
[],
options
?:
IOpenWindowOptions
):
Promise
<
void
>
;
openWindow
(
arg1
?:
IOpenEmptyWindowOptions
|
IWindowOpenable
[],
arg2
?:
IOpenWindowOptions
):
Promise
<
void
>
{
openWindow
(
arg1
?:
IOpenEmptyWindowOptions
|
IWindowOpenable
[],
arg2
?:
IOpenWindowOptions
):
Promise
<
void
>
{
...
...
src/vs/workbench/test/browser/workbenchTestServices.ts
浏览文件 @
7bc12be7
...
@@ -865,6 +865,7 @@ export class TestHostService implements IHostService {
...
@@ -865,6 +865,7 @@ export class TestHostService implements IHostService {
_serviceBrand
:
undefined
;
_serviceBrand
:
undefined
;
readonly
hasFocus
:
boolean
=
true
;
readonly
hasFocus
:
boolean
=
true
;
async
hadLastFocus
():
Promise
<
boolean
>
{
return
true
;
}
readonly
onDidChangeFocus
:
Event
<
boolean
>
=
Event
.
None
;
readonly
onDidChangeFocus
:
Event
<
boolean
>
=
Event
.
None
;
async
restart
():
Promise
<
void
>
{
}
async
restart
():
Promise
<
void
>
{
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录