maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

ActionBar: only add touch listeners if on a touch device

Browse source 
#37917
This commit is contained in:
isidor 2017-11-20 16:57:02 +01:00
parent f29abe48e2
commit 1152a5c013
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/vs/base/browser/touch.ts
View file

@ -35,6 +35,8 @@ export interface GestureEvent extends MouseEvent {
pageY: number;
}
export const isTouchDevice = 'ontouchstart' in window || navigator.maxTouchPoints > 0 || window.navigator.msMaxTouchPoints > 0;
interface Touch {
identifier: number;
screenX: number;

6
src/vs/base/browser/ui/actionbar/actionbar.ts
View file

@ -14,7 +14,7 @@ import { SelectBox } from 'vs/base/browser/ui/selectBox/selectBox';
import { IAction, IActionRunner, Action, IActionChangeEvent, ActionRunner, IRunEvent } from 'vs/base/common/actions';
import DOM = require('vs/base/browser/dom');
import types = require('vs/base/common/types');
import { Gesture, EventType } from 'vs/base/browser/touch';
import { Gesture, EventType, isTouchDevice } from 'vs/base/browser/touch';
import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
import Event, { Emitter } from 'vs/base/common/event';
@ -113,7 +113,9 @@ export class BaseActionItem implements IActionItem {
container.draggable = true;
}
this.builder.on(EventType.Tap, e => this.onClick(e));
if (isTouchDevice) {
this.builder.on(EventType.Tap, e => this.onClick(e));
}
this.builder.on(DOM.EventType.MOUSE_DOWN, (e) => {
if (!enableDragging) {