From dcd5a5435068a50333573d018f865d27eb0dfd4a Mon Sep 17 00:00:00 2001 From: Christopher Oliphant Date: Sat, 13 Apr 2024 11:08:30 -0400 Subject: [PATCH] Fix scrubber position when scrolled --- app/pages/PageEnigma/comps/Timeline/Scrubber.tsx | 5 +++-- .../comps/Timeline/utils/useMouseEventsScrubber.ts | 13 ++++++++++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/app/pages/PageEnigma/comps/Timeline/Scrubber.tsx b/app/pages/PageEnigma/comps/Timeline/Scrubber.tsx index 7cea4086b7..74d6dbdc22 100644 --- a/app/pages/PageEnigma/comps/Timeline/Scrubber.tsx +++ b/app/pages/PageEnigma/comps/Timeline/Scrubber.tsx @@ -17,6 +17,8 @@ export const Scrubber = () => { if (displayTime * 4 * scale.value + 84 - timelineScrollX.value < 84) { return null; } + + console.log(currentTime.value, displayTime, timelineScrollX.value); return (
{ top: 8, left: displayTime * 4 * scale.value + 84 - timelineScrollX.value, }} - onPointerDown={onPointerDown} - > + onPointerDown={onPointerDown}>
diff --git a/app/pages/PageEnigma/comps/Timeline/utils/useMouseEventsScrubber.ts b/app/pages/PageEnigma/comps/Timeline/utils/useMouseEventsScrubber.ts index 889125db9c..2c4bb6ab7f 100644 --- a/app/pages/PageEnigma/comps/Timeline/utils/useMouseEventsScrubber.ts +++ b/app/pages/PageEnigma/comps/Timeline/utils/useMouseEventsScrubber.ts @@ -26,7 +26,7 @@ export const useMouseEventsScrubber = () => { Queue.publish({ queueName: QueueNames.TO_ENGINE, action: toEngineActions.UPDATE_TIME, - data: { currentTime: Math.round(time) + timelineScrollX.value }, + data: { currentTime: Math.round(time) }, }); } }; @@ -42,16 +42,23 @@ export const useMouseEventsScrubber = () => { return; } setTime((oldTime) => { + console.log( + oldTime, + delta, + delta + timelineScrollX.value, + delta + timelineScrollX.value / 4 / scale.value, + ); if (oldTime !== delta) { Queue.publish({ queueName: QueueNames.TO_ENGINE, action: toEngineActions.UPDATE_TIME, - data: { currentTime: delta + timelineScrollX.value }, + data: { + currentTime: delta, + }, }); } return delta; }); - return; } };