mirror of
https://github.com/Microsoft/vscode
synced 2024-08-28 05:19:39 +00:00
Merge pull request #209052 from microsoft/merogge/accview
show acc view on escape of accessible view accessibility help
This commit is contained in:
commit
31fa87c61f
|
@ -320,10 +320,10 @@ export class AccessibleView extends Disposable {
|
|||
|
||||
if (position) {
|
||||
// Context view takes time to show up, so we need to wait for it to show up before we can set the position
|
||||
setTimeout(() => {
|
||||
queueMicrotask(() => {
|
||||
this._editorWidget.revealLine(position.lineNumber);
|
||||
this._editorWidget.setSelection({ startLineNumber: position.lineNumber, startColumn: position.column, endLineNumber: position.lineNumber, endColumn: position.column });
|
||||
}, 10);
|
||||
});
|
||||
}
|
||||
|
||||
if (symbol && this._currentProvider) {
|
||||
|
@ -672,13 +672,17 @@ export class AccessibleView extends Disposable {
|
|||
const accessibleViewHelpProvider: IAccessibleContentProvider = {
|
||||
id: lastProvider.id,
|
||||
provideContent: () => lastProvider.options.customHelp ? lastProvider?.options.customHelp() : this._getAccessibleViewHelpDialogContent(this._goToSymbolsSupported()),
|
||||
onClose: () => this.show(lastProvider),
|
||||
onClose: () => {
|
||||
this._contextViewService.hideContextView();
|
||||
// HACK: Delay to allow the context view to hide #207638
|
||||
queueMicrotask(() => this.show(lastProvider));
|
||||
},
|
||||
options: { type: AccessibleViewType.Help },
|
||||
verbositySettingKey: lastProvider.verbositySettingKey
|
||||
};
|
||||
this._contextViewService.hideContextView();
|
||||
// HACK: Delay to allow the context view to hide #186514
|
||||
setTimeout(() => this.show(accessibleViewHelpProvider, undefined, true), 100);
|
||||
queueMicrotask(() => this.show(accessibleViewHelpProvider, undefined, true));
|
||||
}
|
||||
|
||||
private _getAccessibleViewHelpDialogContent(providerHasSymbols?: boolean): string {
|
||||
|
|
Loading…
Reference in a new issue