Skip to content

Commit

Permalink
Merge branch 'dev' into next
Browse files Browse the repository at this point in the history
  • Loading branch information
bigtimebuddy committed Jun 27, 2022
2 parents 18ebd1b + 6846041 commit 9a025e5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
6 changes: 2 additions & 4 deletions packages/events/src/EventBoundary.ts
Original file line number Diff line number Diff line change
Expand Up @@ -921,10 +921,8 @@ export class EventBoundary
{
this.dispatchEvent(clickEvent, 'tap');
}
else
{
this.dispatchEvent(clickEvent, 'pointertap');
}

this.dispatchEvent(clickEvent, 'pointertap');

this.freeEvent(clickEvent);
}
Expand Down
4 changes: 2 additions & 2 deletions packages/events/src/EventSystem.ts
Original file line number Diff line number Diff line change
Expand Up @@ -496,8 +496,8 @@ export class EventSystem
{
const touch = event.changedTouches[i] as PixiTouch;

if (typeof touch.button === 'undefined') touch.button = event.touches.length ? 1 : 0;
if (typeof touch.buttons === 'undefined') touch.buttons = event.touches.length ? 1 : 0;
if (typeof touch.button === 'undefined') touch.button = 0;
if (typeof touch.buttons === 'undefined') touch.buttons = 1;
if (typeof touch.isPrimary === 'undefined')
{
touch.isPrimary = event.touches.length === 1 && event.type === 'touchstart';
Expand Down

0 comments on commit 9a025e5

Please sign in to comment.