Adopt generic mouse events for debug toolbar.

This commit is contained in:
Peng Lyu
2019-11-20 11:46:04 -08:00
parent 2422b62a26
commit ee3adf5fd0
2 changed files with 9 additions and 4 deletions

View File

@@ -271,6 +271,10 @@ export function addDisposableGenericMouseDownListner(node: EventTarget, handler:
return addDisposableListener(node, platform.isIOS && BrowserFeatures.pointerEvents ? EventType.POINTER_DOWN : EventType.MOUSE_DOWN, handler, useCapture);
}
export function addDisposableGenericMouseMoveListner(node: EventTarget, handler: (event: any) => void, useCapture?: boolean): IDisposable {
return addDisposableListener(node, platform.isIOS && BrowserFeatures.pointerEvents ? EventType.POINTER_MOVE : EventType.MOUSE_MOVE, handler, useCapture);
}
export function addDisposableGenericMouseUpListner(node: EventTarget, handler: (event: any) => void, useCapture?: boolean): IDisposable {
return addDisposableListener(node, platform.isIOS && BrowserFeatures.pointerEvents ? EventType.POINTER_UP : EventType.MOUSE_UP, handler, useCapture);
}
@@ -882,6 +886,7 @@ export const EventType = {
MOUSE_LEAVE: 'mouseleave',
POINTER_UP: 'pointerup',
POINTER_DOWN: 'pointerdown',
POINTER_MOVE: 'pointermove',
CONTEXT_MENU: 'contextmenu',
WHEEL: 'wheel',
// Keyboard

View File

@@ -208,7 +208,7 @@ export class DebugToolBar extends Themable implements IWorkbenchContribution {
}));
this._register(dom.addDisposableListener(window, dom.EventType.RESIZE, () => this.setCoordinates()));
this._register(dom.addDisposableListener(this.dragArea, dom.EventType.MOUSE_UP, (event: MouseEvent) => {
this._register(dom.addDisposableGenericMouseUpListner(this.dragArea, (event: MouseEvent) => {
const mouseClickEvent = new StandardMouseEvent(event);
if (mouseClickEvent.detail === 2) {
// double click on debug bar centers it again #8250
@@ -218,10 +218,10 @@ export class DebugToolBar extends Themable implements IWorkbenchContribution {
}
}));
this._register(dom.addDisposableListener(this.dragArea, dom.EventType.MOUSE_DOWN, (event: MouseEvent) => {
this._register(dom.addDisposableGenericMouseDownListner(this.dragArea, (event: MouseEvent) => {
dom.addClass(this.dragArea, 'dragged');
const mouseMoveListener = dom.addDisposableListener(window, 'mousemove', (e: MouseEvent) => {
const mouseMoveListener = dom.addDisposableGenericMouseMoveListner(window, (e: MouseEvent) => {
const mouseMoveEvent = new StandardMouseEvent(e);
// Prevent default to stop editor selecting text #8524
mouseMoveEvent.preventDefault();
@@ -229,7 +229,7 @@ export class DebugToolBar extends Themable implements IWorkbenchContribution {
this.setCoordinates(mouseMoveEvent.posx - 14, mouseMoveEvent.posy - this.layoutService.getTitleBarOffset());
});
const mouseUpListener = dom.addDisposableListener(window, 'mouseup', (e: MouseEvent) => {
const mouseUpListener = dom.addDisposableGenericMouseUpListner(window, (e: MouseEvent) => {
this.storePosition();
dom.removeClass(this.dragArea, 'dragged');