Skip to content

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

feat(timeline): the tray's plus opens an Add track menu, with top or bottom beside it

Jareer190170137c17
diff --git a/src/crates/concat-host/src/session.rs b/src/crates/concat-host/src/session.rs
index 350b72fe..c3bb4027 100644
--- a/src/crates/concat-host/src/session.rs
+++ b/src/crates/concat-host/src/session.rs
@@ -337,7 +337,9 @@ mod tests {
(1920, 1080),
"the manifest's frame seeds the first timeline"
);
- let view = session.apply(Command::AddTrack).expect("adds a track");
+ let view = session
+ .apply(Command::AddTrack { bottom: false })
+ .expect("adds a track");
assert!(view.can_undo);
session
.set_video(VideoSettings {
diff --git a/src/crates/concat-host/tests/export.rs b/src/crates/concat-host/tests/export.rs
index 2ba816be..d08af09f 100644
--- a/src/crates/concat-host/tests/export.rs
+++ b/src/crates/concat-host/tests/export.rs
@@ -1583,7 +1583,7 @@ fn every_edit_still_exports() {
exported.expect_quiet(19.0);
let sound_track = studio
- .apply(Command::AddTrack)
+ .apply(Command::AddTrack { bottom: false })
.expect("a new track has an id");
studio.apply(Command::AddClip {
media_id: aac,
diff --git a/src/crates/concat-project/src/commands/mod.rs b/src/crates/concat-project/src/commands/mod.rs
index f0146d16..6dfcbc30 100644
--- a/src/crates/concat-project/src/commands/mod.rs
+++ b/src/crates/concat-project/src/commands/mod.rs
@@ -613,9 +613,14 @@ pub enum Command {
/// The video clip - or its detached sound.
clip_id: String,
},
- /// Appends a lane named after the highest "Track N" in use, minting a
- /// "t" id.
- AddTrack,
+ /// Adds a lane, minting a "t" id: on top of the stack, or with
+ /// `bottom` under every other lane. Absent is the top, which is what
+ /// the command did before it could do anything else.
+ AddTrack {
+ /// Under every other lane rather than on top of them.
+ #[serde(default, skip_serializing_if = "std::ops::Not::not")]
+ bottom: bool,
+ },
/// Deletes a lane and every clip on it. Errs at the floor of one track.
RemoveTrack {
/// The lane to delete.
@@ -1076,7 +1081,7 @@ pub fn apply(
command @ (Command::DetachAudio { .. } | Command::ReattachAudio { .. }) => {
audio::apply(project, mint, command)
}
- command @ (Command::AddTrack
+ command @ (Command::AddTrack { .. }
| Command::RemoveTrack { .. }
| Command::SetTrackFlag { .. }) => tracks::apply(project, mint, command),
command @ (Command::AddTimeline
diff --git a/src/crates/concat-project/src/commands/tracks.rs b/src/crates/concat-project/src/commands/tracks.rs
index 635eb87d..4b18bfa2 100644
--- a/src/crates/concat-project/src/commands/tracks.rs
+++ b/src/crates/concat-project/src/commands/tracks.rs
@@ -15,15 +15,22 @@ pub(super) fn apply(
command: Command,
) -> Result<Outcome, CommandError> {
match command {
- Command::AddTrack => {
+ Command::AddTrack { bottom } => {
let timeline = project.active_mut();
let id = mint.next("t");
- timeline.tracks.push(Track {
+ let track = Track {
id: id.clone(),
visible: true,
muted: false,
extra: Default::default(),
- });
+ };
+ // The stack is stored bottom first: the last track is the lane
+ // drawn on top.
+ if bottom {
+ timeline.tracks.insert(0, track);
+ } else {
+ timeline.tracks.push(track);
+ }
Ok(Outcome {
created_id: Some(id),
applied: true,
diff --git a/src/crates/concat-project/src/lib.rs b/src/crates/concat-project/src/lib.rs
index ffd7c062..64ad8bfe 100644
--- a/src/crates/concat-project/src/lib.rs
+++ b/src/crates/concat-project/src/lib.rs
@@ -3458,7 +3458,7 @@ mod tests {
item,
},
Command::Batch {
- commands: vec![Command::AddTrack],
+ commands: vec![Command::AddTrack { bottom: false }],
},
Command::AddClip {
media_id: "m1".to_owned(),
@@ -3529,7 +3529,7 @@ mod tests {
Command::ReattachAudio {
clip_id: "c1".to_owned(),
},
- Command::AddTrack,
+ Command::AddTrack { bottom: false },
Command::RemoveTrack {
track_id: "T1".to_owned(),
},
@@ -3896,4 +3896,32 @@ mod tests {
crate::RetiredFields::default()
);
}
+
+ /// A lane can be added on top of the stack or under it; the command's
+ /// old shape, with no `bottom`, still means the top.
+ #[test]
+ fn a_track_goes_on_top_or_underneath() {
+ let mut editor = Editor::new();
+ let before = editor.project().active().tracks.len();
+ let top = editor
+ .apply(Command::AddTrack { bottom: false })
+ .expect("adds")
+ .created_id
+ .expect("an id");
+ let under = editor
+ .apply(Command::AddTrack { bottom: true })
+ .expect("adds")
+ .created_id
+ .expect("an id");
+ let tracks = &editor.project().active().tracks;
+ assert_eq!(tracks.len(), before + 2);
+ assert_eq!(tracks.last().map(|t| t.id.as_str()), Some(top.as_str()));
+ assert_eq!(tracks.first().map(|t| t.id.as_str()), Some(under.as_str()));
+ let old: Command = serde_json::from_str(r#"{"op":"addTrack"}"#).expect("parses");
+ assert_eq!(old, Command::AddTrack { bottom: false });
+ assert_eq!(
+ serde_json::to_string(&Command::AddTrack { bottom: false }).expect("writes"),
+ r#"{"op":"addTrack"}"#
+ );
+ }
}
diff --git a/src/crates/concat/locales/de.json b/src/crates/concat/locales/de.json
index 123b6580..30af5cbc 100644
--- a/src/crates/concat/locales/de.json
+++ b/src/crates/concat/locales/de.json
@@ -994,6 +994,8 @@
"trackHeader.unlockLane": "Spur entsperren",
"trackHeader.unmuteLane": "Spur laut schalten",
"tray.addTrack": "Spur hinzufügen",
+ "tray.addTrackBottom": "Unten hinzufügen",
+ "tray.addTrackTop": "Oben hinzufügen",
"tray.deleteSelected": "Auswahl löschen",
"tray.freezeMirrorRotateSelected": "Ausgewählten Clip einfrieren, spiegeln oder drehen",
"tray.generateCaptions": "Untertitel erzeugen",
diff --git a/src/crates/concat/locales/en.json b/src/crates/concat/locales/en.json
index 701ba1fc..8375e74b 100644
--- a/src/crates/concat/locales/en.json
+++ b/src/crates/concat/locales/en.json
@@ -994,6 +994,8 @@
"trackHeader.unlockLane": "Unlock lane",
"trackHeader.unmuteLane": "Unmute lane",
"tray.addTrack": "Add track",
+ "tray.addTrackBottom": "Add to bottom",
+ "tray.addTrackTop": "Add to top",
"tray.deleteSelected": "Delete selected",
"tray.freezeMirrorRotateSelected": "Freeze, mirror or rotate the selected clip",
"tray.generateCaptions": "Generate Captions",
diff --git a/src/crates/concat/locales/es.json b/src/crates/concat/locales/es.json
index e1f960bf..ae72769a 100644
--- a/src/crates/concat/locales/es.json
+++ b/src/crates/concat/locales/es.json
@@ -994,6 +994,8 @@
"trackHeader.unlockLane": "Desbloquear pista",
"trackHeader.unmuteLane": "Activar el sonido de la pista",
"tray.addTrack": "Añadir pista",
+ "tray.addTrackBottom": "Añadir abajo",
+ "tray.addTrackTop": "Añadir arriba",
"tray.deleteSelected": "Eliminar la selección",
"tray.freezeMirrorRotateSelected": "Congelar, reflejar o rotar el clip seleccionado",
"tray.generateCaptions": "Generar subtítulos",
diff --git a/src/crates/concat/locales/fa.json b/src/crates/concat/locales/fa.json
index 5d6937f5..9e9f5c96 100644
--- a/src/crates/concat/locales/fa.json
+++ b/src/crates/concat/locales/fa.json
@@ -994,6 +994,8 @@
"trackHeader.unlockLane": "باز کردن قفل لاین",
"trackHeader.unmuteLane": "فعال‌کردن صدا کردن لاین",
"tray.addTrack": "افزودن ترک",
+ "tray.addTrackBottom": "افزودن در پایین",
+ "tray.addTrackTop": "افزودن در بالا",
"tray.deleteSelected": "حذف موارد انتخاب‌شده",
"tray.freezeMirrorRotateSelected": "فریز، آینه یا چرخش کلیپ انتخاب‌شده",
"tray.generateCaptions": "ساخت زیرنویس‌ها",
diff --git a/src/crates/concat/locales/fr.json b/src/crates/concat/locales/fr.json
index 85d3edd6..45d0fb63 100644
--- a/src/crates/concat/locales/fr.json
+++ b/src/crates/concat/locales/fr.json
@@ -994,6 +994,8 @@
"trackHeader.unlockLane": "Déverrouiller la piste",
"trackHeader.unmuteLane": "Rétablir le son de la piste",
"tray.addTrack": "Ajouter une piste",
+ "tray.addTrackBottom": "Ajouter en bas",
+ "tray.addTrackTop": "Ajouter en haut",
"tray.deleteSelected": "Supprimer la sélection",
"tray.freezeMirrorRotateSelected": "Figer, refléter ou pivoter le clip sélectionné",
"tray.generateCaptions": "Générer les sous-titres",
diff --git a/src/crates/concat/locales/hr.json b/src/crates/concat/locales/hr.json
index 5952c603..a3f0f3bb 100644
--- a/src/crates/concat/locales/hr.json
+++ b/src/crates/concat/locales/hr.json
@@ -994,6 +994,8 @@
"trackHeader.unlockLane": "Otključaj traku",
"trackHeader.unmuteLane": "Uključi zvuk trake",
"tray.addTrack": "Dodaj traku",
+ "tray.addTrackBottom": "Dodaj na dno",
+ "tray.addTrackTop": "Dodaj na vrh",
"tray.deleteSelected": "Obriši odabrano",
"tray.freezeMirrorRotateSelected": "Zamrzni, zrcali ili zakreni odabrani klip",
"tray.generateCaptions": "Generiraj titlove",
diff --git a/src/crates/concat/locales/it.json b/src/crates/concat/locales/it.json
index dc0ca07d..3cae2075 100644
--- a/src/crates/concat/locales/it.json
+++ b/src/crates/concat/locales/it.json
@@ -994,6 +994,8 @@
"trackHeader.unlockLane": "Sblocca traccia",
"trackHeader.unmuteLane": "Riattiva il suono della traccia",
"tray.addTrack": "Aggiungi traccia",
+ "tray.addTrackBottom": "Aggiungi in basso",
+ "tray.addTrackTop": "Aggiungi in alto",
"tray.deleteSelected": "Elimina la selezione",
"tray.freezeMirrorRotateSelected": "Blocca, specchia o ruota la clip selezionata",
"tray.generateCaptions": "Genera sottotitoli",
diff --git a/src/crates/concat/locales/ja.json b/src/crates/concat/locales/ja.json
index 816bf8ab..c65bc58f 100644
--- a/src/crates/concat/locales/ja.json
+++ b/src/crates/concat/locales/ja.json
@@ -994,6 +994,8 @@
"trackHeader.unlockLane": "トラックのロックを解除",
"trackHeader.unmuteLane": "トラックのミュートを解除",
"tray.addTrack": "トラックを追加",
+ "tray.addTrackBottom": "一番下に追加",
+ "tray.addTrackTop": "一番上に追加",
"tray.deleteSelected": "選択項目を削除",
"tray.freezeMirrorRotateSelected": "選択したクリップをフリーズ、ミラー、回転",
"tray.generateCaptions": "字幕を生成",
diff --git a/src/crates/concat/locales/ko.json b/src/crates/concat/locales/ko.json
index 1dccafb3..ce41b865 100644
--- a/src/crates/concat/locales/ko.json
+++ b/src/crates/concat/locales/ko.json
@@ -994,6 +994,8 @@
"trackHeader.unlockLane": "트랙 잠금 해제",
"trackHeader.unmuteLane": "트랙 음소거 해제",
"tray.addTrack": "트랙 추가",
+ "tray.addTrackBottom": "맨 아래에 추가",
+ "tray.addTrackTop": "맨 위에 추가",
"tray.deleteSelected": "선택 항목 삭제",
"tray.freezeMirrorRotateSelected": "선택한 클립을 정지, 반전 또는 회전",
"tray.generateCaptions": "자막 생성",
diff --git a/src/crates/concat/locales/pt-BR.json b/src/crates/concat/locales/pt-BR.json
index 51f6a670..4a3f70d6 100644
--- a/src/crates/concat/locales/pt-BR.json
+++ b/src/crates/concat/locales/pt-BR.json
@@ -994,6 +994,8 @@
"trackHeader.unlockLane": "Desbloquear faixa",
"trackHeader.unmuteLane": "Ativar o som da faixa",
"tray.addTrack": "Adicionar faixa",
+ "tray.addTrackBottom": "Adicionar embaixo",
+ "tray.addTrackTop": "Adicionar no topo",
"tray.deleteSelected": "Excluir seleção",
"tray.freezeMirrorRotateSelected": "Congelar, espelhar ou girar o clipe selecionado",
"tray.generateCaptions": "Gerar legendas",
diff --git a/src/crates/concat/locales/ru.json b/src/crates/concat/locales/ru.json
index 401e69aa..e549abbe 100644
--- a/src/crates/concat/locales/ru.json
+++ b/src/crates/concat/locales/ru.json
@@ -994,6 +994,8 @@
"trackHeader.unlockLane": "Разблокировать дорожку",
"trackHeader.unmuteLane": "Включить звук дорожки",
"tray.addTrack": "Добавить дорожку",
+ "tray.addTrackBottom": "Добавить снизу",
+ "tray.addTrackTop": "Добавить сверху",
"tray.deleteSelected": "Удалить выбранное",
"tray.freezeMirrorRotateSelected": "Стоп-кадр, отражение или поворот выбранного клипа",
"tray.generateCaptions": "Создать субтитры",
diff --git a/src/crates/concat/locales/tr.json b/src/crates/concat/locales/tr.json
index 39670aa2..07109402 100644
--- a/src/crates/concat/locales/tr.json
+++ b/src/crates/concat/locales/tr.json
@@ -994,6 +994,8 @@
"trackHeader.unlockLane": "Parçanın kilidini aç",
"trackHeader.unmuteLane": "Parçanın sesini aç",
"tray.addTrack": "Parça ekle",
+ "tray.addTrackBottom": "En alta ekle",
+ "tray.addTrackTop": "En üste ekle",
"tray.deleteSelected": "Seçilenleri sil",
"tray.freezeMirrorRotateSelected": "Seçili klibi dondur, aynala veya döndür",
"tray.generateCaptions": "Altyazı oluştur",
diff --git a/src/crates/concat/locales/zh-Hans.json b/src/crates/concat/locales/zh-Hans.json
index 727629b7..7f8f8023 100644
--- a/src/crates/concat/locales/zh-Hans.json
+++ b/src/crates/concat/locales/zh-Hans.json
@@ -994,6 +994,8 @@
"trackHeader.unlockLane": "解锁轨道",
"trackHeader.unmuteLane": "取消轨道静音",
"tray.addTrack": "添加轨道",
+ "tray.addTrackBottom": "添加到底部",
+ "tray.addTrackTop": "添加到顶部",
"tray.deleteSelected": "删除所选",
"tray.freezeMirrorRotateSelected": "定格、镜像或旋转所选片段",
"tray.generateCaptions": "生成字幕",
diff --git a/src/crates/concat/locales/zh-TW.json b/src/crates/concat/locales/zh-TW.json
index 58b240e8..71b89c42 100644
--- a/src/crates/concat/locales/zh-TW.json
+++ b/src/crates/concat/locales/zh-TW.json
@@ -994,6 +994,8 @@
"trackHeader.unlockLane": "解除鎖定軌道",
"trackHeader.unmuteLane": "取消軌道靜音",
"tray.addTrack": "加入軌道",
+ "tray.addTrackBottom": "新增到底部",
+ "tray.addTrackTop": "新增到頂部",
"tray.deleteSelected": "刪除所選",
"tray.freezeMirrorRotateSelected": "定格、鏡像或旋轉所選片段",
"tray.generateCaptions": "產生字幕",
diff --git a/src/crates/concat/src/lib.rs b/src/crates/concat/src/lib.rs
index 1d4e23b9..0a4c17bb 100644
--- a/src/crates/concat/src/lib.rs
+++ b/src/crates/concat/src/lib.rs
@@ -818,8 +818,8 @@ pub fn run() -> Result<(), slint::PlatformError> {
editor.on_hover_ended(on_lanes!(|state| {
state.handle(Msg::Timeline(TimelineMsg::HoverEnded));
}));
- editor.on_add_track(on_window!(|state| {
- state.apply(concat_project::Command::AddTrack);
+ editor.on_add_track(on_window!(|state, bottom: bool| {
+ state.apply(concat_project::Command::AddTrack { bottom });
}));
editor.on_delete_selected(on_window!(|state| {
state.delete_selected();
diff --git a/src/crates/concat/ui/editor.slint b/src/crates/concat/ui/editor.slint
index 6a713185..3cdd636c 100644
--- a/src/crates/concat/ui/editor.slint
+++ b/src/crates/concat/ui/editor.slint
@@ -353,7 +353,7 @@ export global Editor {
/// of the clip's own menu - see `clip-context`.
callback captions();
callback speak();
- callback add-track();
+ callback add-track(bottom: bool);
callback zoom-to-fit(width: length);
callback zoom(factor: float, anchor-seconds: float);
/// The lanes are this wide on screen now, in logical pixels: what
diff --git a/src/crates/concat/ui/timeline/tray.slint b/src/crates/concat/ui/timeline/tray.slint
index 650e03e7..0302cd58 100644
--- a/src/crates/concat/ui/timeline/tray.slint
+++ b/src/crates/concat/ui/timeline/tray.slint
@@ -3,7 +3,7 @@
import { I18n } from "../i18n.slint";
import { Theme } from "../theme/theme.slint";
-import { Glyph } from "../icons.slint";
+import { Glyph, Icon } from "../icons.slint";
import { IconButton } from "../primitives/panel.slint";
import { TimelineTool } from "model.slint";
@@ -56,6 +56,137 @@ component TrayButton inherits IconButton {
idle: Theme.fg;
}
+// One row of the add menu and its submenu: a word, a mark at the end.
+component MenuItem inherits Rectangle {
+ in property <string> text;
+ in property <Glyph> trailing: Glyph.none;
+ out property <bool> hovered: touch.has-hover;
+
+ callback clicked();
+
+ height: 26px;
+ border-radius: Theme.r-sm;
+ background: touch.has-hover ? Theme.field-hover : Colors.transparent;
+
+ HorizontalLayout {
+ padding-left: 8px;
+ padding-right: 6px;
+ spacing: 6px;
+
+ Text {
+ horizontal-stretch: 1;
+ text: root.text;
+ color: Theme.fg;
+ font-size: Theme.fs;
+ vertical-alignment: center;
+ }
+
+ if root.trailing != Glyph.none: VerticalLayout {
+ alignment: center;
+ Icon { glyph: root.trailing; size: 12px; tint: Theme.fg-muted; }
+ }
+ }
+
+ touch := TouchArea {
+ mouse-cursor: pointer;
+ clicked => { root.clicked(); }
+ }
+}
+
+// The plus at the head of the tray: a menu whose first row adds a lane,
+// and whose submenu, opened by hovering that row, says where - on top of
+// the stack or under it. A click on the row itself adds on top, as the
+// plus always did.
+component AddMenu inherits Rectangle {
+ callback add-track(bottom: bool);
+
+ width: 26px;
+ height: 26px;
+
+ property <length> row-h: 26px;
+
+ TrayButton {
+ glyph: Glyph.plus;
+ label: I18n.t("tray.addTrack");
+ icon-size: 14px;
+ clicked => { list.show(); }
+ }
+
+ list := PopupWindow {
+ x: 0;
+ y: root.height + 4px;
+ width: 168px;
+ height: root.row-h + 8px;
+ close-policy: close-on-click-outside;
+
+ Rectangle {
+ background: Theme.raised;
+ border-width: 1px;
+ border-color: Theme.line-strong;
+ border-radius: Theme.r;
+
+ VerticalLayout {
+ padding: 4px;
+ alignment: start;
+
+ add := MenuItem {
+ text: I18n.t("tray.addTrack");
+ trailing: Glyph.chevron-right;
+ clicked => {
+ sub.close();
+ list.close();
+ root.add-track(false);
+ }
+ changed hovered => {
+ if (self.hovered) {
+ sub.show();
+ }
+ }
+ }
+ }
+ }
+
+ // Beside the row it belongs to, overlapping the menu's edge by a
+ // hair so the pointer crosses no gap on its way in.
+ sub := PopupWindow {
+ x: parent.width - 4px;
+ y: 0;
+ width: 156px;
+ height: 2 * root.row-h + 8px;
+ close-policy: close-on-click-outside;
+
+ Rectangle {
+ background: Theme.raised;
+ border-width: 1px;
+ border-color: Theme.line-strong;
+ border-radius: Theme.r;
+
+ VerticalLayout {
+ padding: 4px;
+ alignment: start;
+
+ MenuItem {
+ text: I18n.t("tray.addTrackTop");
+ clicked => {
+ sub.close();
+ list.close();
+ root.add-track(false);
+ }
+ }
+ MenuItem {
+ text: I18n.t("tray.addTrackBottom");
+ clicked => {
+ sub.close();
+ list.close();
+ root.add-track(true);
+ }
+ }
+ }
+ }
+ }
+ }
+}
+
export component TimelineTray inherits Rectangle {
in property <TimelineTool> tool: TimelineTool.select;
in property <bool> snap: true;
@@ -102,7 +233,8 @@ export component TimelineTray inherits Rectangle {
callback delete-selected();
callback captions();
callback speak();
- callback add-track();
+ /// Add a lane: on top of the stack, or with `bottom` under it.
+ callback add-track(bottom: bool);
callback fit();
callback zoom(factor: float);
@@ -124,11 +256,8 @@ export component TimelineTray inherits Rectangle {
padding-bottom: 7px;
spacing: 4px;
- TrayButton {
- glyph: Glyph.plus;
- label: I18n.t("tray.addTrack");
- icon-size: 14px;
- clicked => { root.add-track(); }
+ AddMenu {
+ add-track(bottom) => { root.add-track(bottom); }
}
Divider { }
diff --git a/src/crates/concat/ui/workspace/seat.slint b/src/crates/concat/ui/workspace/seat.slint
index d015c31d..5b16e0de 100644
--- a/src/crates/concat/ui/workspace/seat.slint
+++ b/src/crates/concat/ui/workspace/seat.slint
@@ -401,7 +401,7 @@ export component Seat inherits Rectangle {
delete-selected => { Editor.delete-selected(); }
captions => { Editor.captions(); }
speak => { Editor.speak(); }
- add-track => { Editor.add-track(); }
+ add-track(bottom) => { Editor.add-track(bottom); }
zoom-to-fit(width) => { Editor.zoom-to-fit(width); }
zoom(factor, anchor) => { Editor.zoom(factor, anchor); }
lanes-resized(width) => { Editor.lanes-resized(width); }
diff --git a/src/crates/concat/ui/workspace/timeline-pane.slint b/src/crates/concat/ui/workspace/timeline-pane.slint
index 7b2d654a..93d5d8d3 100644
--- a/src/crates/concat/ui/workspace/timeline-pane.slint
+++ b/src/crates/concat/ui/workspace/timeline-pane.slint
@@ -75,7 +75,7 @@ export component TimelinePane inherits Rectangle {
callback delete-selected();
callback captions();
callback speak();
- callback add-track();
+ callback add-track(bottom: bool);
callback zoom-to-fit(width: length);
callback zoom(factor: float, anchor-seconds: float);
callback lanes-resized(width: float);
@@ -346,7 +346,7 @@ export component TimelinePane inherits Rectangle {
delete-selected => { root.delete-selected(); }
captions => { root.captions(); }
speak => { root.speak(); }
- add-track => { root.add-track(); }
+ add-track(bottom) => { root.add-track(bottom); }
fit => { root.zoom-to-fit(lanes.width); }
// No anchor from a button: a wheel zooms about the pointer and a
// press zooms about the view, since a press has no pointer to