Skip to content

Commit 52d2d0a

Browse files
committed
refactor(timeline): switch misc mouse events to pixi events
1 parent 6f6ac8e commit 52d2d0a

File tree

1 file changed

+17
-14
lines changed

1 file changed

+17
-14
lines changed

packages/app-frontend/src/features/timeline/TimelineView.vue

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -430,15 +430,15 @@ export default defineComponent({
430430
drawLayerBackgroundEffects()
431431
})
432432
433-
function updateLayerHover (event: MouseEvent) {
434-
let { offsetY } = event
435-
offsetY -= verticalScrollingContainer.y
436-
if (offsetY >= 0) {
433+
function updateLayerHover (event: FederatedPointerEvent) {
434+
let { globalY } = event
435+
globalY -= verticalScrollingContainer.y
436+
if (globalY >= 0) {
437437
let y = 0
438438
// Find the hovering layer depending on each layer's height
439439
for (const layer of layers.value) {
440440
y += (layer.height + 1) * LAYER_SIZE
441-
if (offsetY <= y) {
441+
if (globalY <= y) {
442442
hoverLayerId.value = layer.id
443443
return
444444
}
@@ -1095,11 +1095,11 @@ export default defineComponent({
10951095
timeCursor.lineTo(0.5, app.view.height)
10961096
}
10971097
1098-
function updateCursorPosition (event: MouseEvent) {
1099-
const { offsetX } = event
1100-
timeCursor.x = offsetX
1098+
function updateCursorPosition (event: FederatedPointerEvent) {
1099+
const { globalX } = event
1100+
timeCursor.x = globalX
11011101
timeCursor.visible = true
1102-
cursorTime.value = offsetX / app.view.width * (endTime.value - startTime.value) + startTime.value
1102+
cursorTime.value = globalX / app.view.width * (endTime.value - startTime.value) + startTime.value
11031103
}
11041104
11051105
function clearCursor () {
@@ -1342,7 +1342,7 @@ export default defineComponent({
13421342
13431343
// Misc. mouse events
13441344
1345-
function onMouseMove (event: MouseEvent) {
1345+
function onMouseMove (event: FederatedPointerEvent) {
13461346
updateLayerHover(event)
13471347
updateCursorPosition(event)
13481348
}
@@ -1352,10 +1352,15 @@ export default defineComponent({
13521352
clearCursor()
13531353
}
13541354
1355+
onMounted(() => {
1356+
// @ts-ignore
1357+
app.stage.addEventListener('pointermove', onMouseMove)
1358+
// @ts-ignore
1359+
app.stage.addEventListener('pointerout', onMouseOut)
1360+
})
1361+
13551362
return {
13561363
wrapper,
1357-
onMouseMove,
1358-
onMouseOut,
13591364
onResize,
13601365
}
13611366
},
@@ -1367,8 +1372,6 @@ export default defineComponent({
13671372
ref="wrapper"
13681373
class="relative overflow-hidden"
13691374
data-id="timeline-view-wrapper"
1370-
@mousemove="onMouseMove"
1371-
@mouseout="onMouseOut"
13721375
>
13731376
<resize-observer @notify="onResize" />
13741377
</div>

0 commit comments

Comments
 (0)