Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
db21446a
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,发现更多精彩内容 >>
提交
db21446a
编写于
5月 30, 2016
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
missing focus when triggering search while quick open is open (fixes #6668)
上级
e08b4bd9
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
26 addition
and
14 deletion
+26
-14
src/vs/base/parts/quickopen/browser/quickOpenWidget.ts
src/vs/base/parts/quickopen/browser/quickOpenWidget.ts
+14
-8
src/vs/workbench/browser/parts/quickopen/quickOpenController.ts
.../workbench/browser/parts/quickopen/quickOpenController.ts
+12
-6
未找到文件。
src/vs/base/parts/quickopen/browser/quickOpenWidget.ts
浏览文件 @
db21446a
...
...
@@ -34,7 +34,7 @@ export interface IQuickOpenCallbacks {
onCancel
:
()
=>
void
;
onType
:
(
value
:
string
)
=>
void
;
onShow
?:
()
=>
void
;
onHide
?:
()
=>
void
;
onHide
?:
(
focusLost
?:
boolean
)
=>
void
;
onFocusLost
?:
()
=>
boolean
/* veto close */
;
}
...
...
@@ -67,6 +67,12 @@ export class QuickOpenController extends DefaultController {
}
}
enum
HideReason
{
ELEMENT_SELECTED
,
FOCUS_LOST
,
CANCELED
}
const
DEFAULT_INPUT_ARIA_LABEL
=
nls
.
localize
(
'
quickOpenAriaLabel
'
,
"
Quick picker. Type to narrow down results.
"
);
export
class
QuickOpenWidget
implements
IModelProvider
{
...
...
@@ -121,7 +127,7 @@ export class QuickOpenWidget implements IModelProvider {
if
(
keyboardEvent
.
keyCode
===
KeyCode
.
Escape
)
{
DOM
.
EventHelper
.
stop
(
e
,
true
);
this
.
hide
(
true
);
this
.
hide
(
HideReason
.
CANCELED
);
}
})
.
on
(
DOM
.
EventType
.
CONTEXT_MENU
,
(
e
:
Event
)
=>
DOM
.
EventHelper
.
stop
(
e
,
true
))
// Do this to fix an issue on Mac where the menu goes into the way
...
...
@@ -418,7 +424,7 @@ export class QuickOpenWidget implements IModelProvider {
// Hide if command was run successfully
if
(
hide
)
{
this
.
hide
();
this
.
hide
(
HideReason
.
ELEMENT_SELECTED
);
}
}
...
...
@@ -662,7 +668,7 @@ export class QuickOpenWidget implements IModelProvider {
return
height
;
}
public
hide
(
isCancel
:
boolean
=
false
):
void
{
public
hide
(
reason
?:
HideReason
):
void
{
if
(
!
this
.
isVisible
())
{
return
;
}
...
...
@@ -672,7 +678,7 @@ export class QuickOpenWidget implements IModelProvider {
this
.
builder
.
domBlur
();
// report failure cases
if
(
isCancel
)
{
if
(
reason
===
HideReason
.
CANCELED
)
{
if
(
this
.
model
)
{
let
entriesCount
=
this
.
model
.
entries
.
filter
(
e
=>
this
.
isElementVisible
(
this
.
model
,
e
)).
length
;
if
(
this
.
usageLogger
)
{
...
...
@@ -702,14 +708,14 @@ export class QuickOpenWidget implements IModelProvider {
}
// Callbacks
if
(
isCancel
)
{
if
(
reason
===
HideReason
.
CANCELED
)
{
this
.
callbacks
.
onCancel
();
}
else
{
this
.
callbacks
.
onOk
();
}
if
(
this
.
callbacks
.
onHide
)
{
this
.
callbacks
.
onHide
();
this
.
callbacks
.
onHide
(
reason
===
HideReason
.
FOCUS_LOST
);
}
}
...
...
@@ -840,7 +846,7 @@ export class QuickOpenWidget implements IModelProvider {
const
veto
=
this
.
callbacks
.
onFocusLost
&&
this
.
callbacks
.
onFocusLost
();
if
(
!
veto
)
{
this
.
hide
(
false
/* Do not treat loosing focus as cancel! */
);
this
.
hide
(
HideReason
.
FOCUS_LOST
);
}
});
}
...
...
src/vs/workbench/browser/parts/quickopen/quickOpenController.ts
浏览文件 @
db21446a
...
...
@@ -290,8 +290,10 @@ export class QuickOpenController extends WorkbenchComponent implements IQuickOpe
onCancel
:
()
=>
{
/* ignore, handle later */
},
onType
:
(
value
:
string
)
=>
{
/* ignore, handle later */
},
onShow
:
()
=>
this
.
emitQuickOpenVisibilityChange
(
true
),
onHide
:
()
=>
{
this
.
restoreFocus
();
// focus back to editor or viewlet
onHide
:
(
focusLost
?:
boolean
)
=>
{
if
(
!
focusLost
)
{
this
.
restoreFocus
();
// focus back to editor unless user clicked somewhere else
}
this
.
emitQuickOpenVisibilityChange
(
false
);
// event
}
},
{
...
...
@@ -429,8 +431,10 @@ export class QuickOpenController extends WorkbenchComponent implements IQuickOpe
onShow
:
()
=>
{
this
.
emitQuickOpenVisibilityChange
(
true
);
// event
},
onHide
:
()
=>
{
this
.
restoreFocus
();
// focus back to editor or viewlet
onHide
:
(
focusLost
?:
boolean
)
=>
{
if
(
!
focusLost
)
{
this
.
restoreFocus
();
// focus back to editor unless user clicked somewhere else
}
this
.
emitQuickOpenVisibilityChange
(
false
);
// event
}
});
...
...
@@ -524,7 +528,7 @@ export class QuickOpenController extends WorkbenchComponent implements IQuickOpe
this
.
inQuickOpenMode
.
set
(
true
);
this
.
emitQuickOpenVisibilityChange
(
true
);
},
onHide
:
()
=>
{
onHide
:
(
focusLost
?:
boolean
)
=>
{
this
.
inQuickOpenMode
.
reset
();
// Complete promises that are waiting
...
...
@@ -532,7 +536,9 @@ export class QuickOpenController extends WorkbenchComponent implements IQuickOpe
this
.
promisesToCompleteOnHide
.
pop
()(
true
);
}
this
.
restoreFocus
();
// focus back to editor or viewlet
if
(
!
focusLost
)
{
this
.
restoreFocus
();
// focus back to editor unless user clicked somewhere else
}
this
.
emitQuickOpenVisibilityChange
(
false
);
}
},
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录