noe/tl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: dedupe scroll-to-clip by bar boundary instead of track

Browse source 
When an annotation with scroll-to enabled spans multiple bars (discontinuities),
only scroll when the playhead enters a new bar, not for every mark. Track
[ann-id bar-idx] pairs instead of just the current track to avoid excessive
scrolling as the playhead moves within a bar.

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
This commit is contained in:
Your Name 2026-06-30 14:05:58 -04:00
parent 6a02b0665b
commit d91ea6c78a
1 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

26
tl/src/tl/views.cljs
View file

@ -14,7 +14,7 @@
(defonce scroll-el (atom nil)) (defonce scroll-el (atom nil))
(defonce body-scroll-el (atom nil)) ; the vertical (tracks) scroll container (defonce body-scroll-el (atom nil)) ; the vertical (tracks) scroll container
(defonce playhead-el (atom nil)) ; the single full-height playhead overlay (defonce playhead-el (atom nil)) ; the single full-height playhead overlay
(defonce played-track (atom nil)) ; last track auto-scrolled into view during playback (defonce played-bar (atom nil)) ; [ann-id bar-idx] last auto-scrolled to during playback
(defonce play (atom nil)) ; {:ctx :segs :fps :idx} while playing, else nil (defonce play (atom nil)) ; {:ctx :segs :fps :idx} while playing, else nil
(defonce active-insert! (atom nil)) ; the live content-editor's (insert! link) fn (defonce active-insert! (atom nil)) ; the live content-editor's (insert! link) fn
(declare commit-link!) (declare commit-link!)
@ -344,17 +344,19 @@
(follow! fps zoom playhead) (follow! fps zoom playhead)
;; clip-following: only while the playhead is actually inside a bar of ;; clip-following: only while the playhead is actually inside a bar of
;; an annotation that opts in (:meta :scroll-to) — scroll each of its ;; an annotation that opts in (:meta :scroll-to) — scroll each of its
;; clips into view as the playhead crosses onto a new track. (Strict ;; clips into view as the playhead crosses onto a new bar (discontinuity).
;; containment, NOT ::active-annotation, which falls back to the ;; Track [ann-id bar-idx] to avoid scrolling within the same bar.
;; nearest annotation and would fire on every clip.) (when-let [current-bar (some (fn [a]
(when (some (fn [a] (and (ann-scroll-to? (get-in scene [:groups (:id a)])) (when (and (ann-scroll-to? (get-in scene [:groups (:id a)]))
(some (fn [[lo hi]] (<= lo playhead hi)) (:bars a)))) (some (fn [[lo hi]] (<= lo playhead hi)) (:bars a)))
anns) [(:id a) (first (keep-indexed (fn [j [lo hi]]
(let [track (:track (nth segs (seg-at segs playhead) nil))] (when (<= lo playhead hi) j))
(when (not= track @played-track) (:bars a)))]))
(reset! played-track track) anns)]
(scroll-to-seg-track! segs playhead)))))) (when (not= current-bar @played-bar)
(reset! played-track nil)) (reset! played-bar current-bar)
(scroll-to-seg-track! segs playhead)))))
(reset! played-bar nil))
(r/after-render #(position-playhead! fps zoom playhead)) (r/after-render #(position-playhead! fps zoom playhead))
[:div.timeline {:class (when-not @tracks-open? "tracks-collapsed")} [:div.timeline {:class (when-not @tracks-open? "tracks-collapsed")}
[:div.playhead.timeline-playhead {:ref (fn [n] (reset! playhead-el n))} [:div.playhead.timeline-playhead {:ref (fn [n] (reset! playhead-el n))}