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 #75678

Browse source
This commit is contained in:
Peng Lyu 2019-06-18 07:48:12 -07:00
parent 1af5b2a2b2
commit fb57ba6c43
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/vs/workbench/services/keybinding/browser/keybindingService.ts
View file

@ -11,7 +11,7 @@ import { Emitter, Event } from 'vs/base/common/event';
import { IJSONSchema } from 'vs/base/common/jsonSchema';
import { Keybinding, ResolvedKeybinding, KeyCode, KeyMod } from 'vs/base/common/keyCodes';
import { KeybindingParser } from 'vs/base/common/keybindingParser';
import { OS, OperatingSystem } from 'vs/base/common/platform';
import { OS, OperatingSystem, isWeb } from 'vs/base/common/platform';
import { ICommandService, CommandsRegistry } from 'vs/platform/commands/common/commands';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { Extensions as ConfigExtensions, IConfigurationNode, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
@ -314,6 +314,10 @@ export class WorkbenchKeybindingService extends AbstractKeybindingService {
}
private _assertBrowserConflicts(kb: Keybinding, commandId: string): boolean {
if (!isWeb) {
return false;
}
if (browser.isFullscreen() && (<any>navigator).keyboard) {
return false;
}