Skip to content
Snippets Groups Projects
Commit e24c76d2 authored by Alexander Rose's avatar Alexander Rose
Browse files

update modifierkeys on mouse input

parent b6273205
No related branches found
No related tags found
No related merge requests found
...@@ -303,6 +303,13 @@ namespace InputObserver { ...@@ -303,6 +303,13 @@ namespace InputObserver {
} }
} }
function updateModifierKeys(event: MouseEvent | WheelEvent | TouchEvent) {
modifierKeys.alt = event.altKey
modifierKeys.shift = event.shiftKey
modifierKeys.control = event.ctrlKey
modifierKeys.meta = event.metaKey
}
function handleBlur() { function handleBlur() {
if (buttons || modifierKeys.shift || modifierKeys.alt || modifierKeys.meta || modifierKeys.control) { if (buttons || modifierKeys.shift || modifierKeys.alt || modifierKeys.meta || modifierKeys.control) {
buttons = 0 as ButtonsType buttons = 0 as ButtonsType
...@@ -397,6 +404,7 @@ namespace InputObserver { ...@@ -397,6 +404,7 @@ namespace InputObserver {
onPointerMove(getCenterTouch(ev)) onPointerMove(getCenterTouch(ev))
} else { } else {
buttons = ButtonsType.Flag.Auxilary buttons = ButtonsType.Flag.Auxilary
updateModifierKeys(ev)
pinch.next({ pinch.next({
delta: touchDelta, delta: touchDelta,
fraction: lastTouchDistance / touchDistance, fraction: lastTouchDistance / touchDistance,
...@@ -414,16 +422,19 @@ namespace InputObserver { ...@@ -414,16 +422,19 @@ namespace InputObserver {
} }
function onMouseDown(ev: MouseEvent) { function onMouseDown(ev: MouseEvent) {
updateModifierKeys(ev)
buttons = getButtons(ev) buttons = getButtons(ev)
onPointerDown(ev) onPointerDown(ev)
} }
function onMouseMove(ev: MouseEvent) { function onMouseMove(ev: MouseEvent) {
updateModifierKeys(ev)
buttons = getButtons(ev) buttons = getButtons(ev)
onPointerMove(ev) onPointerMove(ev)
} }
function onMouseUp(ev: MouseEvent) { function onMouseUp(ev: MouseEvent) {
updateModifierKeys(ev)
onPointerUp(ev) onPointerUp(ev)
endDrag() endDrag()
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment