Skip to content

The truly free, open-source, local-first, cross-platform CapCut replacement. Scriptable through a JSON-RPC API & MCP.

feat(ui): lane switches on the left, the cross on the right, and a wider column

Jareer029f33f18ca8
diff --git a/src/crates/concat/ui/timeline/track-header.slint b/src/crates/concat/ui/timeline/track-header.slint
index a56a9b0c..3f4c127b 100644
--- a/src/crates/concat/ui/timeline/track-header.slint
+++ b/src/crates/concat/ui/timeline/track-header.slint
@@ -148,29 +148,17 @@ component Header inherits Rectangle {
spacing: 1px;
// No `alignment: start` here. A start-aligned row gives every
// child its preferred width and stops stretching altogether — and
- // the name column's preferred width is nothing, so the label
- // vanished and the lane read as a bare row of switches. The
- // switches are start-aligned on the *cross* axis individually,
- // which is the part that was actually wanted.
-
- // The lanes are deliberately untyped and no longer named, so
- // nothing goes here. It stays as the row's give: the switches
- // stay against the trailing edge at every column width, and a
- // narrow column takes the gap away from here rather than from
- // them.
- Rectangle { horizontal-stretch: 1; }
-
- // Revealed on hover, and never on the last lane standing.
- if root.removable && row.has-hover: VerticalLayout {
- alignment: start;
- IconButton {
- glyph: Glyph.close;
- label: I18n.t("Remove lane");
- icon-size: 11px;
- danger: true;
- clicked => { root.removed(); }
- }
- }
+ // the spacer's preferred width is nothing, so the two ends would
+ // collapse together. The switches are start-aligned on the
+ // *cross* axis individually, which is the part actually wanted.
+ //
+ // The lane's own switches - size, lock, visibility, mute - sit
+ // against the leading edge, and the one that takes the lane
+ // away sits alone against the trailing edge, with the row's
+ // give between them: a destructive button is kept apart from
+ // the ones pressed all day, the way a form keeps Delete away
+ // from Save. A narrow column takes the squeeze from the gap,
+ // not from either end.
VerticalLayout {
alignment: start;
@@ -224,6 +212,23 @@ component Header inherits Rectangle {
}
}
}
+
+ Rectangle { horizontal-stretch: 1; }
+
+ // Revealed on hover, and never on the last lane standing. The
+ // slot is always there, so the switches do not slide when the
+ // cross appears.
+ VerticalLayout {
+ alignment: start;
+ width: 26px;
+ if root.removable && row.has-hover: IconButton {
+ glyph: Glyph.close;
+ label: I18n.t("Remove lane");
+ icon-size: 11px;
+ danger: true;
+ clicked => { root.removed(); }
+ }
+ }
}
}
}
diff --git a/src/crates/concat/ui/workspace/timeline-pane.slint b/src/crates/concat/ui/workspace/timeline-pane.slint
index 212b2a49..8dcabced 100644
--- a/src/crates/concat/ui/workspace/timeline-pane.slint
+++ b/src/crates/concat/ui/workspace/timeline-pane.slint
@@ -106,11 +106,13 @@ export component TimelinePane inherits Rectangle {
///
/// A lane has no name — it is untyped, and its place in the stack is the
/// only handle anything needs on it — so the column is a strip of
- /// switches. Five 26px slots at their widest (remove, row height, lock,
- /// visibility, mute; remove only on hover), 1px between them and the
- /// row's own 8px and 4px gutters come to 147px. The rest is the give
- /// that keeps the switches off the scrollbar on the trailing edge.
- in-out property <length> header-width: 156px;
+ /// switches. Five 26px slots at their widest (row height, lock,
+ /// visibility, mute against the leading edge; remove alone against the
+ /// trailing one, shown on hover), 1px between them and the row's own
+ /// 8px and 4px gutters come to 147px. The rest is the gap between the
+ /// two ends, which at the old 156px was nine pixels and read as one
+ /// crammed strip beside the lanes it labels.
+ in-out property <length> header-width: 188px;
/// The switches and their gutters, and nothing spare: below this the row
/// has nowhere left to take the squeeze from and the buttons overlap.
in property <length> min-header: 150px;