From 62a23cd0e21666683e6d7740a236184ca278d62d Mon Sep 17 00:00:00 2001 From: Bill Date: Fri, 24 Sep 2021 05:04:13 -0400 Subject: [PATCH] Updates --- src/nitro/ui/MouseEventType.ts | 1 + src/room/renderer/IRoomRenderingCanvas.ts | 2 +- src/room/renderer/RoomSpriteCanvas.ts | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/nitro/ui/MouseEventType.ts b/src/nitro/ui/MouseEventType.ts index f7b0892e..c2bf6114 100644 --- a/src/nitro/ui/MouseEventType.ts +++ b/src/nitro/ui/MouseEventType.ts @@ -8,4 +8,5 @@ export class MouseEventType public static MOUSE_UP: string = 'mouseup'; public static ROLL_OVER: string = 'mouseover'; public static ROLL_OUT: string = 'mouseout'; + public static RIGHT_CLICK: string = 'contextmenu'; } diff --git a/src/room/renderer/IRoomRenderingCanvas.ts b/src/room/renderer/IRoomRenderingCanvas.ts index 1fc8d71f..8914a199 100644 --- a/src/room/renderer/IRoomRenderingCanvas.ts +++ b/src/room/renderer/IRoomRenderingCanvas.ts @@ -18,7 +18,7 @@ export interface IRoomRenderingCanvas skipSpriteVisibilityChecking(): void; resumeSpriteVisibilityChecking(): void; getPlaneSortableSprites(): SortableSprite[]; - handleMouseEvent(k: number, _arg_2: number, _arg_3: string, _arg_4: boolean, _arg_5: boolean, _arg_6: boolean, _arg_7: boolean): boolean; + handleMouseEvent(x: number, y: number, type: string, altKey: boolean, ctrlKey: boolean, shiftKey: boolean, buttonDown: boolean): boolean; getSortableSpriteList(): RoomObjectSpriteData[]; getDisplayAsTexture(): RenderTexture; id: number; diff --git a/src/room/renderer/RoomSpriteCanvas.ts b/src/room/renderer/RoomSpriteCanvas.ts index a6ce8297..d54f3075 100644 --- a/src/room/renderer/RoomSpriteCanvas.ts +++ b/src/room/renderer/RoomSpriteCanvas.ts @@ -948,13 +948,13 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas return didHitSprite; } - protected createMouseEvent(x: number, y: number, _arg_3: number, _arg_4: number, type: string, _arg_6: string, _arg_7: boolean, _arg_8: boolean, _arg_9: boolean, _arg_10: boolean): RoomSpriteMouseEvent + protected createMouseEvent(x: number, y: number, localX: number, localY: number, type: string, tag: string, altKey: boolean, ctrlKey: boolean, shiftKey: boolean, buttonDown: boolean): RoomSpriteMouseEvent { const screenX: number = (x - (this._width / 2)); const screenY: number = (y - (this._height / 2)); const canvasName = `canvas_${ this._id }`; - return new RoomSpriteMouseEvent(type, ((canvasName + '_') + this._eventId), canvasName, _arg_6, screenX, screenY, _arg_3, _arg_4, _arg_8, _arg_7, _arg_9, _arg_10); + return new RoomSpriteMouseEvent(type, ((canvasName + '_') + this._eventId), canvasName, tag, screenX, screenY, localX, localY, ctrlKey, altKey, shiftKey, buttonDown); } protected bufferMouseEvent(k: RoomSpriteMouseEvent, _arg_2: string): void