The truly free, open-source, local-first, cross-platform CapCut replacement. Scriptable through a JSON-RPC API & MCP.
Rust ffmpegfree-video-editormodel-context-protocolnon-linear-editoroffline-firstopen-source-video-editorself-hostedvideo-editingvideo-editing-automationvideo-editing-softwarevideo-editing-toolsvideo-editorvoice-cloningyoutube-automationyoutube-shorts
fix(ui): a vertical swipe scrolls the stack, and the lane names take a wheel
Jareerfc6666a1f7b2
diff --git a/src/crates/concat/ui/timeline/lanes.slint b/src/crates/concat/ui/timeline/lanes.slintindex 21d09978..02cbf87b 100644--- a/src/crates/concat/ui/timeline/lanes.slint+++ b/src/crates/concat/ui/timeline/lanes.slint@@ -661,17 +661,30 @@ export component Lanes inherits Rectangle {root.seconds-at(self.mouse-x));return EventResult.accept;}- // A trackpad's horizontal axis always pans time. Shift does the- // same for a wheel, which has no horizontal axis of its own.- // Everything else scrolls the stack, which is what a plain wheel- // means in every other list.- if (event.delta-x != 0px || event.modifiers.shift) {+ // A trackpad's horizontal axis pans time, and its vertical axis+ // scrolls the stack, which is what a plain wheel means in every+ // other list. Shift turns a wheel's one axis into the pan, since+ // a wheel has no horizontal axis of its own.+ //+ // Both axes out of the one event, not whichever showed up. A+ // two-finger swipe is never exactly vertical, and the old rule+ // sent the whole event sideways on any x at all, so most of a+ // vertical swipe's y was thrown away: the stack crept and+ // stuttered while the ruler twitched underneath it. A diagonal+ // swipe now moves diagonally, the way it does on a page.+ if (event.modifiers.shift) {root.scrolled(Math.max(0, root.scroll-left- (event.delta-x != 0px ? event.delta-x : event.delta-y)/ root.px-per-second));return EventResult.accept;}- root.track-scrolled(-event.delta-y);+ if (event.delta-x != 0px) {+ root.scrolled(Math.max(0, root.scroll-left+ - event.delta-x / root.px-per-second));+ }+ if (event.delta-y != 0px) {+ root.track-scrolled(-event.delta-y);+ }return EventResult.accept;}diff --git a/src/crates/concat/ui/timeline/track-header.slint b/src/crates/concat/ui/timeline/track-header.slintindex 3f4c127b..5aa5e61d 100644--- a/src/crates/concat/ui/timeline/track-header.slint+++ b/src/crates/concat/ui/timeline/track-header.slint@@ -244,7 +244,8 @@ export component TrackHeaders inherits Rectangle {/// and two answers to one question is one answer too many.in property <length> overflow;- /// The bar was dragged. Absolute, and already inside 0..overflow.+ /// The bar was dragged, or the column wheeled. Absolute, and already+ /// inside 0..overflow.callback scrolled(offset: length);callback flag-changed(index: int, visible: bool, muted: bool, locked: bool);@@ -253,59 +254,78 @@ export component TrackHeaders inherits Rectangle {clip: true;- for track[index] in root.tracks: Header {- x: 0;- y: root.ruler-height + track.top - root.track-scroll;- width: parent.width;- height: track.height;- // Clipped to the stack rather than allowed to ride over the ruler,- // which a scrolled row would otherwise do.- visible: self.y + track.height > root.ruler-height && self.y < root.height;+ // A wheel over a lane's name scrolls the stack, the same stack a wheel+ // over its lane scrolls: the column is the left end of the same rows,+ // and a wheel that works over one end of a row and not the other reads+ // as broken. Ancestor of the rows, the bar and the corner, so a wheel+ // none of them handles bubbles up to it; a sibling would not see it.+ wheel := TouchArea {+ scroll-event(event) => {+ if (event.delta-y == 0px) {+ return EventResult.reject;+ }+ // Negated because Slint's delta-y is positive scrolling *up*,+ // and up is a smaller offset. Clamped here the way the pane+ // clamps the lanes' wheel, so the two never disagree.+ root.scrolled(Math.max(0px, Math.min(root.overflow,+ root.track-scroll - event.delta-y)));+ return EventResult.accept;+ }- track: track;- removable: root.tracks.length > 1;+ for track[index] in root.tracks: Header {+ x: 0;+ y: root.ruler-height + track.top - root.track-scroll;+ width: parent.width;+ height: track.height;+ // Clipped to the stack rather than allowed to ride over the ruler,+ // which a scrolled row would otherwise do.+ visible: self.y + track.height > root.ruler-height && self.y < root.height;- flag-changed(visible, muted, locked) => {- root.flag-changed(index, visible, muted, locked);- }- sized(size) => { root.sized(index, size); }- removed => { root.removed(index); }- }+ track: track;+ removable: root.tracks.length > 1;- // The bar, over the rows and under the corner. On the trailing edge,- // where the stack it scrolls ends and where a scroll container puts one.- // Short and inset rather than full-height: a stack that overflows by a- // row would otherwise draw a thumb the length of the column, and a mark- // that long stops reading as something you can take hold of.- ThinScrollbar {- x: parent.width - self.width - 1px;- y: root.ruler-height + 4px;- height: Math.max(0px, root.height - root.ruler-height - 8px);- viewport: self.height;- content: self.height + root.overflow;- offset: root.track-scroll;- min-thumb: 16px;- max-thumb: 0.5;- scrolled(to) => { root.scrolled(to); }- }+ flag-changed(visible, muted, locked) => {+ root.flag-changed(index, visible, muted, locked);+ }+ sized(size) => { root.sized(index, size); }+ removed => { root.removed(index); }+ }- // The ruler corner: opposite the ruler, and not part of the scrolling- // stack. Declared after the rows so it paints over whichever one is- // half-scrolled behind it — `visible` above drops a row only once it is- // fully past, and this covers the sliver in between.- Rectangle {- x: 0;- y: 0;- width: parent.width;- height: root.ruler-height;- background: Theme.ruler;+ // The bar, over the rows and under the corner. On the trailing edge,+ // where the stack it scrolls ends and where a scroll container puts one.+ // Short and inset rather than full-height: a stack that overflows by a+ // row would otherwise draw a thumb the length of the column, and a mark+ // that long stops reading as something you can take hold of.+ ThinScrollbar {+ x: parent.width - self.width - 1px;+ y: root.ruler-height + 4px;+ height: Math.max(0px, root.height - root.ruler-height - 8px);+ viewport: self.height;+ content: self.height + root.overflow;+ offset: root.track-scroll;+ min-thumb: 16px;+ max-thumb: 0.5;+ scrolled(to) => { root.scrolled(to); }+ }+ // The ruler corner: opposite the ruler, and not part of the scrolling+ // stack. Declared after the rows so it paints over whichever one is+ // half-scrolled behind it — `visible` above drops a row only once it is+ // fully past, and this covers the sliver in between.Rectangle {x: 0;- y: parent.height - 1px;+ y: 0;width: parent.width;- height: 1px;- background: Theme.line;+ height: root.ruler-height;+ background: Theme.ruler;++ Rectangle {+ x: 0;+ y: parent.height - 1px;+ width: parent.width;+ height: 1px;+ background: Theme.line;+ }}}}