Skip to content

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

The dark grounds lift into mid-dark grey, the kind hues step down, a filter is one bar

Jareere41475be42d8
diff --git a/engine/crates/concat/ui/icons.slint b/engine/crates/concat/ui/icons.slint
index 3dc2ef52..11faacdc 100644
--- a/engine/crates/concat/ui/icons.slint
+++ b/engine/crates/concat/ui/icons.slint
@@ -89,6 +89,7 @@ export enum Glyph {
trash,
magnet,
waveform,
+ filter,
eye-off,
volume,
volume-off,
@@ -470,6 +471,12 @@ export component Icon inherits Rectangle {
+ " 1.704 0l6.365-6.367A1 1 0 0 0 8.716 4.282z M5 8l4 4";
}
+ // lucide/blend: two circles overlapping, for a filter - a look laid
+ // over whatever plays under it.
+ if root.glyph == Glyph.filter: Stroked {
+ size: root.size; tint: root.tint; weight: root.weight;
+ commands: "M16 9a7 7 0 1 1-14 0a7 7 0 1 1 14 0 M22 15a7 7 0 1 1-14 0a7 7 0 1 1 14 0";
+ }
// lucide/audio-lines
if root.glyph == Glyph.waveform: Stroked {
size: root.size; tint: root.tint; weight: root.weight;
diff --git a/engine/crates/concat/ui/theme/dark.slint b/engine/crates/concat/ui/theme/dark.slint
index 667cb287..27d2bd7e 100644
--- a/engine/crates/concat/ui/theme/dark.slint
+++ b/engine/crates/concat/ui/theme/dark.slint
@@ -53,12 +53,14 @@
export global Dark {
// surfaces
//
- // Panels are a grey that visibly floats on the near-black ground — never
- // the ground colour itself, or the panes melt into the window and their
+ // Panels are a grey that visibly floats on the darker ground — never the
+ // ground colour itself, or the panes melt into the window and their
// grab-able gutters vanish.
//
// A panel is judged as a ground, by whole panes painted in it rather than
- // by narrow strips, and a near-black one is a stop too dark at that size.
+ // by narrow strips, and a near-black one is a stop too dark at that size:
+ // the whole ladder sits in the mid-dark greys a desktop editor's window
+ // is made of, with the page under it and the lanes under the panel.
//
// Holding the panel up leaves room underneath, so `well` is genuinely
// sunken — darker than the surface it is cut into, which is how a sunken
@@ -75,12 +77,12 @@ export global Dark {
// separating a pane from the ground; without one the value step has to do
// all of it, and a darker ladder leaves the panes reading as holes in the
// window rather than as surfaces on it.
- out property <color> panel: #1c1c1c;
- out property <color> raised: #262626;
- out property <color> well: #131313;
- out property <color> field: #2c2c2c;
- out property <color> field-hover: #343434;
- out property <color> field-active: #3f3f3f;
+ out property <color> panel: #212123;
+ out property <color> raised: #2b2b2e;
+ out property <color> well: #19191b;
+ out property <color> field: #323235;
+ out property <color> field-hover: #3b3b3e;
+ out property <color> field-active: #46464a;
// hairlines — white-alpha, so they hold on panel, well, and ground alike.
out property <color> line: #ffffff1a; // rgb(255 255 255 / 0.1)
@@ -131,21 +133,26 @@ export global Dark {
// the clip it becomes on a track are the same two colours, so they read as
// one object moved rather than two things that happen to have the same
// name.
- out property <color> kind-video: #3d8bf8;
- out property <color> kind-video-well: #19293f;
- out property <color> kind-audio: #f4c21b;
- out property <color> kind-audio-well: #3e3413;
- out property <color> kind-image: #c07af8;
- out property <color> kind-image-well: #33253f;
- out property <color> kind-text: #f06ab4;
- out property <color> kind-text-well: #3d2232;
+ //
+ // The marks are a step down from the brand's vivid five: they are the
+ // header strip of every clip and the ground of every card's badge, and
+ // at full chroma a stack of eight tracks shouts. Darker, they still say
+ // the kind and let the white ink on them read.
+ out property <color> kind-video: #3373d1;
+ out property <color> kind-video-well: #142238;
+ out property <color> kind-audio: #d3a616;
+ out property <color> kind-audio-well: #302810;
+ out property <color> kind-image: #9f63d6;
+ out property <color> kind-image-well: #2a1e34;
+ out property <color> kind-text: #cf5a99;
+ out property <color> kind-text-well: #321c29;
// The marks are the five bright hues the brand's palette has beside its
// lime accent: blue, yellow, violet, pink and teal. A filter layer is not
// a medium — nothing was imported to make one — so it takes the one hue
// the four media kinds leave free rather than borrowing whichever of
// them it happens to sit over.
- out property <color> kind-filter: #3bd39a;
- out property <color> kind-filter-well: #19372c;
+ out property <color> kind-filter: #2fb384;
+ out property <color> kind-filter-well: #143025;
// timeline
//
@@ -166,14 +173,14 @@ export global Dark {
// still reads as a well cut into the pane, and a clip's own dark ground
// now sits *on* something rather than floating in a hole. Both stay well
// under `panel`, or the empty stretches would read as content.
- out property <color> lane: #101011;
- out property <color> lane-alt: #171718;
+ out property <color> lane: #1a1a1c;
+ out property <color> lane-alt: #1e1e20;
// The ruler is its own surface, not the first row of the stack: a step
// under the darker lane, so the strip carrying the timestamps reads as
// the floor of the pane and the banding starts below it. It followed
// `raised` before, which put it above the panel and made it the brightest
// thing in the pane — the opposite of what a ruler should be.
- out property <color> ruler: #1c1c1c;
+ out property <color> ruler: #171719;
/// The vertical rules. 6% white was set against a lane that was still a
/// dark grey, and all but vanished when the lanes went black — a grid that
/// costs elements and reads as nothing. 14% clears both of the tones the
@@ -221,7 +228,7 @@ export global Dark {
// A sample of something meant for footage - a title look on a card -
// sits on a dark ground so a white title reads, but a grey one rather
// than the stage's black, so the card is a card and not a hole.
- out property <color> sample-ground: #2c2c2e;
+ out property <color> sample-ground: #37373a;
// The sheet that covers the window behind a dialog. Dark rather than
// tinted: it has to work over the whole editor, and any hue in it would
@@ -246,6 +253,6 @@ export global Dark {
// window ground the panes float on — a shade under the darkest panel so
// the gutters read as gaps and not as seams
- out property <color> page: #08080a;
+ out property <color> page: #151517;
out property <color> page-fg-muted: #a1a1a6;
}
diff --git a/engine/crates/concat/ui/timeline/lanes.slint b/engine/crates/concat/ui/timeline/lanes.slint
index 312b5081..8eabdecd 100644
--- a/engine/crates/concat/ui/timeline/lanes.slint
+++ b/engine/crates/concat/ui/timeline/lanes.slint
@@ -45,11 +45,78 @@ global Paint {
return kind == ClipKind.audio ? Glyph.music
: kind == ClipKind.image ? Glyph.image
: kind == ClipKind.text ? Glyph.sparkle
- : kind == ClipKind.filter ? Glyph.waveform
+ : kind == ClipKind.filter ? Glyph.filter
: Glyph.film;
}
}
+// The fade ramps over one region of a clip. The shaded wedge is the part
+// being taken away and the bright line is the envelope itself - the shape
+// every editor draws, because it reads as "this much is being attenuated".
+// Drawn at the foot of a picture clip's body, over the whole of a sound's,
+// and over the whole bar of a filter layer, which is all bar.
+component Ramps inherits Rectangle {
+ in property <float> fade-in;
+ in property <float> fade-out;
+ in property <length> px-per-second;
+ /// The wedges' height; they sit at the foot of this element.
+ in property <length> ramp-h: root.height;
+
+ if root.fade-in > 0: Rectangle {
+ x: 0;
+ y: parent.height - root.ramp-h;
+ width: Math.min(parent.width, root.fade-in * root.px-per-second);
+ height: root.ramp-h;
+
+ Path {
+ width: parent.width;
+ height: parent.height;
+ viewbox-width: 1;
+ viewbox-height: 1;
+ fit: fill;
+ fill: Theme.fade-shade;
+ commands: "M 0 0 L 1 0 L 0 1 Z";
+ }
+ Path {
+ width: parent.width;
+ height: parent.height;
+ viewbox-width: 1;
+ viewbox-height: 1;
+ fit: fill;
+ stroke: Theme.fade-edge;
+ stroke-width: 1px;
+ commands: "M 0 1 L 1 0";
+ }
+ }
+
+ if root.fade-out > 0: Rectangle {
+ x: parent.width - self.width;
+ y: parent.height - root.ramp-h;
+ width: Math.min(parent.width, root.fade-out * root.px-per-second);
+ height: root.ramp-h;
+
+ Path {
+ width: parent.width;
+ height: parent.height;
+ viewbox-width: 1;
+ viewbox-height: 1;
+ fit: fill;
+ fill: Theme.fade-shade;
+ commands: "M 0 0 L 1 0 L 1 1 Z";
+ }
+ Path {
+ width: parent.width;
+ height: parent.height;
+ viewbox-width: 1;
+ viewbox-height: 1;
+ fit: fill;
+ stroke: Theme.fade-edge;
+ stroke-width: 1px;
+ commands: "M 0 0 L 1 1";
+ }
+ }
+}
+
// ── one clip ─────────────────────────────────────────────────────────────────
component Clip inherits Rectangle {
@@ -75,17 +142,23 @@ component Clip inherits Rectangle {
/// The coloured name strip; the rest of the clip is its body. A title
/// is all strip: its name is its words, and a body under it would show
- /// the same words a second time in a taller clip.
- property <length> header-h: root.item.kind == ClipKind.text ? root.height : 17px;
+ /// the same words a second time in a taller clip. A filter layer is all
+ /// strip too - one bar, the look's mark before its name - since it has
+ /// no picture and no sound to show under a header.
+ property <bool> all-strip: root.item.kind == ClipKind.text
+ || root.item.kind == ClipKind.filter;
+ property <length> header-h: root.all-strip ? root.height : 17px;
+ /// A filter layer wears its mark before its name, the way the look is
+ /// told from a title or a sound on the lanes at a glance.
+ property <bool> marked: root.item.kind == ClipKind.filter;
+ property <length> text-x: root.marked ? 22px : 7px;
property <length> body-h: Math.max(0px, root.height - root.header-h);
/// A fade on a picture clip is shaded in a band at the foot instead of
/// over the whole body: the fade is an *audio* property, and shading the
- /// picture would say it fades to black. A filter layer has no picture to
- /// mislead about, and its ramp is the whole layer coming up, so it shades
- /// like sound does.
- property <bool> fade-whole: root.item.kind == ClipKind.audio
- || root.item.kind == ClipKind.filter;
- property <length> fade-h: root.fade-whole ? root.body-h : root.body-h * 0.45;
+ /// picture would say it fades to black. Sound shades its whole body; a
+ /// filter layer's ramp is the whole layer coming up, and it shades its
+ /// whole bar.
+ property <length> fade-h: root.item.kind == ClipKind.audio ? root.body-h : root.body-h * 0.45;
/// -1 body, 0 leading edge, 1 trailing edge
property <int> edge-at: touch.mouse-x < root.edge-grab ? 0
@@ -172,12 +245,9 @@ component Clip inherits Rectangle {
// Before the frames arrive, a picture clip shows its kind's mark the
// way a bin card does — faint and large, so it reads as a placeholder
- // and not as a badge. A filter layer takes the same treatment for the
- // opposite reason: there is no picture to draw, and there never will
- // be one.
- if (((root.item.kind == ClipKind.video || root.item.kind == ClipKind.image)
- && root.item.strip.frames == 0) || root.item.kind == ClipKind.filter)
- && root.width > 40px: Icon {
+ // and not as a badge.
+ if (root.item.kind == ClipKind.video || root.item.kind == ClipKind.image)
+ && root.item.strip.frames == 0 && root.width > 40px: Icon {
x: (parent.width - self.width) / 2;
y: (parent.height - self.height) / 2;
glyph: root.badge;
@@ -185,61 +255,16 @@ component Clip inherits Rectangle {
tint: root.mark.with-alpha(0.3);
}
- // The fade ramps. The shaded wedge is the part being taken away and
- // the bright line is the envelope itself — the shape every editor
- // draws, because it reads as "this much is being attenuated".
- if root.item.fade-in > 0: Rectangle {
+ // The fade ramps, at the foot of the body.
+ Ramps {
x: 0;
- y: parent.height - root.fade-h;
- width: Math.min(parent.width, root.item.fade-in * root.px-per-second);
- height: root.fade-h;
-
- Path {
- width: parent.width;
- height: parent.height;
- viewbox-width: 1;
- viewbox-height: 1;
- fit: fill;
- fill: Theme.fade-shade;
- commands: "M 0 0 L 1 0 L 0 1 Z";
- }
- Path {
- width: parent.width;
- height: parent.height;
- viewbox-width: 1;
- viewbox-height: 1;
- fit: fill;
- stroke: Theme.fade-edge;
- stroke-width: 1px;
- commands: "M 0 1 L 1 0";
- }
- }
-
- if root.item.fade-out > 0: Rectangle {
- x: parent.width - self.width;
- y: parent.height - root.fade-h;
- width: Math.min(parent.width, root.item.fade-out * root.px-per-second);
- height: root.fade-h;
-
- Path {
- width: parent.width;
- height: parent.height;
- viewbox-width: 1;
- viewbox-height: 1;
- fit: fill;
- fill: Theme.fade-shade;
- commands: "M 0 0 L 1 0 L 1 1 Z";
- }
- Path {
- width: parent.width;
- height: parent.height;
- viewbox-width: 1;
- viewbox-height: 1;
- fit: fill;
- stroke: Theme.fade-edge;
- stroke-width: 1px;
- commands: "M 0 0 L 1 1";
- }
+ y: 0;
+ width: parent.width;
+ height: parent.height;
+ fade-in: root.item.fade-in;
+ fade-out: root.item.fade-out;
+ px-per-second: root.px-per-second;
+ ramp-h: root.fade-h;
}
// A transition on the cut into this clip: the wedge pair every editor
@@ -279,10 +304,19 @@ component Clip inherits Rectangle {
height: root.header-h;
background: root.mark;
+ if root.marked && root.width > 20px: Icon {
+ x: 6px;
+ y: (parent.height - self.height) / 2;
+ glyph: Glyph.filter;
+ size: 11px;
+ tint: Theme.clip-ink;
+ }
+
if root.width > 30px: Text {
- x: 7px;
+ x: root.text-x;
y: 0;
- width: parent.width - 14px - (root.item.fx && root.width > 60px ? 20px : 0px);
+ width: parent.width - root.text-x - 7px
+ - (root.item.fx && root.width > 60px ? 20px : 0px);
height: parent.height;
text: root.item.name;
color: Theme.clip-ink;
@@ -291,6 +325,17 @@ component Clip inherits Rectangle {
overflow: elide;
}
+ // A filter layer's ramps run over its whole bar; see Ramps.
+ if root.marked: Ramps {
+ x: 0;
+ y: 0;
+ width: parent.width;
+ height: parent.height;
+ fade-in: root.item.fade-in;
+ fade-out: root.item.fade-out;
+ px-per-second: root.px-per-second;
+ }
+
// An `fx` chip when effects are live on the clip, so a styled clip is
// tellable from a plain one without opening a panel.
if root.item.fx && root.width > 60px: Rectangle {