development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 04:49:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix #21227

Browse source
This commit is contained in:
Benjamin Pasero 2017-02-23 10:28:38 +01:00
parent 72fe8f51b7
commit 06e219e4a9
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/vs/workbench/parts/search/browser/searchViewlet.ts
View file

@ -474,13 +474,13 @@ export class SearchViewlet extends Viewlet {
let focusToSelectionDelayHandle: number;
let lastFocusToSelection: number;
const focusToSelection = () => {
const focusToSelection = (originalEvent: KeyboardEvent | MouseEvent) => {
lastFocusToSelection = Date.now();
const focus = this.tree.getFocus();
let payload: any;
if (focus instanceof Match) {
payload = { origin: 'keyboard', originalEvent: event };
payload = { origin: 'keyboard', originalEvent, preserveFocus: true };
}
this.tree.setSelection([focus], payload);
@ -490,13 +490,15 @@ export class SearchViewlet extends Viewlet {
this.toUnbind.push(this.tree.addListener2('focus', (event: any) => {
let keyboard = event.payload && event.payload.origin === 'keyboard';
if (keyboard) {
let originalEvent: KeyboardEvent | MouseEvent = event.payload && event.payload.originalEvent;
// debounce setting selection so that we are not too quickly opening
// when the user is pressing and holding the key to move focus
if (focusToSelectionDelayHandle || (Date.now() - lastFocusToSelection <= 75)) {
window.clearTimeout(focusToSelectionDelayHandle);
focusToSelectionDelayHandle = window.setTimeout(() => focusToSelection(), 300);
focusToSelectionDelayHandle = window.setTimeout(() => focusToSelection(originalEvent), 300);
} else {
focusToSelection();
focusToSelection(originalEvent);
}
}
}));
@ -518,7 +520,7 @@ export class SearchViewlet extends Viewlet {
}
let sideBySide = (originalEvent && (originalEvent.ctrlKey || originalEvent.metaKey));
let focusEditor = (keyboard && !event.payload.originalEvent /* TODO@Rob ugly only way to distinguish selection from a command from selection via SearchController */) || doubleClick || (event.payload && event.payload.focusEditor);
let focusEditor = (keyboard && (!event.payload || !event.payload.preserveFocus)) || doubleClick;
if (element instanceof Match) {
let selectedMatch: Match = element;