Skip to content

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

feat(inspector): Adjust opens on its wheels and curves, and Speed sits under Basic

Jareer661edcbd0b50
diff --git a/src/crates/concat/ui/inspector/clip-inspector.slint b/src/crates/concat/ui/inspector/clip-inspector.slint
index e67a6668..c8320129 100644
--- a/src/crates/concat/ui/inspector/clip-inspector.slint
+++ b/src/crates/concat/ui/inspector/clip-inspector.slint
@@ -1749,6 +1749,9 @@ export component AudioPanel inherits VerticalLayout {
/// Audio tab's.
export component SpeedPanel inherits VerticalLayout {
in property <SelectedClipData> selected;
+ /// The panel's first section, with no hairline above it; false where
+ /// it follows another, as it does under Basic.
+ in property <bool> first: true;
callback set(field: ClipField, value: float);
callback commit();
@@ -1759,7 +1762,7 @@ export component SpeedPanel inherits VerticalLayout {
changed selected => { root.seed(); }
Section {
- first: true;
+ first: root.first;
speed := SectionHeader {
title: I18n.t("common.speed");
collapsible: true;
@@ -1818,44 +1821,11 @@ export component AdjustPanel inherits VerticalLayout {
}
}
- // See PresetStack for why each row re-seeds its knob. A subhead
+ // The wheels and curves first, the knobs after: the grading tools
+ // are what a colourist reaches for, and they sit above the fold.
+ // See PresetStack for why each knob's row re-seeds it; a subhead
// opens each run of rows that share a group.
SectionBody {
- for p[i] in root.params: VerticalLayout {
- spacing: Theme.gap;
-
- if p.group != "" && (i == 0 || root.params[i - 1].group != p.group): Subhead {
- title: p.group;
- }
-
- Rectangle {
- property <AppliedParamData> data: p;
- height: knob.preferred-height;
- changed data => { knob.value = self.data.value; }
-
- knob := Param {
- unit: p.unit;
- label: p.label;
- value: p.value;
- minimum: p.min;
- maximum: p.max;
- step: p.step;
- default-value: p.default-value;
- fmt: p.fmt;
- keyable: p.keyable;
- key-name: p.key;
- key-state: {
- field: ClipField.scale,
- keyed: p.keyed,
- here: p.here,
- prev: p.prev,
- next: p.next,
- };
- changed(v) => { root.set(p.key, v); root.commit(); }
- }
- }
- }
-
// The wheels, three in a row: a puck is two knobs of the panel,
// `<key>.x` and `<key>.y`, and the master a third.
if root.wheels.length > 0: VerticalLayout {
@@ -1906,6 +1876,42 @@ export component AdjustPanel inherits VerticalLayout {
}
}
}
+
+ for p[i] in root.params: VerticalLayout {
+ spacing: Theme.gap;
+
+ if p.group != "" && (i == 0 || root.params[i - 1].group != p.group): Subhead {
+ title: p.group;
+ }
+
+ Rectangle {
+ property <AppliedParamData> data: p;
+ height: knob.preferred-height;
+ changed data => { knob.value = self.data.value; }
+
+ knob := Param {
+ unit: p.unit;
+ label: p.label;
+ value: p.value;
+ minimum: p.min;
+ maximum: p.max;
+ step: p.step;
+ default-value: p.default-value;
+ fmt: p.fmt;
+ keyable: p.keyable;
+ key-name: p.key;
+ key-state: {
+ field: ClipField.scale,
+ keyed: p.keyed,
+ here: p.here,
+ prev: p.prev,
+ next: p.next,
+ };
+ changed(v) => { root.set(p.key, v); root.commit(); }
+ }
+ }
+ }
+
}
}
}
diff --git a/src/crates/concat/ui/workspace/config-pane.slint b/src/crates/concat/ui/workspace/config-pane.slint
index 31bd0949..755a8bf2 100644
--- a/src/crates/concat/ui/workspace/config-pane.slint
+++ b/src/crates/concat/ui/workspace/config-pane.slint
@@ -270,9 +270,7 @@ export component ConfigPane inherits Rectangle {
/// The sections of the current tab, as the dropdown lists them.
property <[string]> sections: root.heading == "Video"
- ? (root.is-shape ? ["Basic"]
- : root.is-image ? ["Basic", "Enhance", "Adjust"]
- : ["Basic", "Enhance", "Speed", "Adjust"])
+ ? (root.is-shape ? ["Basic"] : ["Basic", "Enhance", "Adjust"])
: root.heading == "Audio"
? (root.is-audio ? ["Sound", "Speed"] : ["Sound"])
: root.heading == "Effects" ? ["Effects"]
@@ -281,8 +279,7 @@ export component ConfigPane inherits Rectangle {
/// The sections as the dropdown shows them; see `tabs-shown`.
property <[string]> sections-shown: root.heading == "Video"
? (root.is-shape ? [I18n.t("configPane.basic")]
- : root.is-image ? [I18n.t("configPane.basic"), I18n.t("common.enhance"), I18n.t("common.adjust")]
- : [I18n.t("configPane.basic"), I18n.t("common.enhance"), I18n.t("common.speed"), I18n.t("common.adjust")])
+ : [I18n.t("configPane.basic"), I18n.t("common.enhance"), I18n.t("common.adjust")])
: root.heading == "Audio"
? (root.is-audio ? [I18n.t("configPane.sound"), I18n.t("common.speed")] : [I18n.t("configPane.sound")])
: root.heading == "Effects" ? [I18n.t("common.effects")]
@@ -602,30 +599,41 @@ export component ConfigPane inherits Rectangle {
padding: 0px;
PaneScroll {
- if root.showing == "Basic": VideoPanel {
- selected: root.selected;
- applied: root.applied-visual;
- params: root.visual-params;
- colours: root.visual-colours;
- brush-tool: root.brush-tool;
- brush-size: root.brush-size;
- painting: root.painting;
- set(field, value) => { root.clip-set(field, value); }
- commit => { root.clip-commit(); }
- chain-add(id) => { root.chain-add(false, id); }
- chain-remove(index) => { root.chain-remove(false, index); }
- chain-set-param(index, key, value) => {
- root.chain-set-param(false, index, key, value);
+ // Basic, with the clip's speed under it: one knob is not a
+ // page of its own.
+ if root.showing == "Basic": VerticalLayout {
+ VideoPanel {
+ selected: root.selected;
+ applied: root.applied-visual;
+ params: root.visual-params;
+ colours: root.visual-colours;
+ brush-tool: root.brush-tool;
+ brush-size: root.brush-size;
+ painting: root.painting;
+ set(field, value) => { root.clip-set(field, value); }
+ commit => { root.clip-commit(); }
+ chain-add(id) => { root.chain-add(false, id); }
+ chain-remove(index) => { root.chain-remove(false, index); }
+ chain-set-param(index, key, value) => {
+ root.chain-set-param(false, index, key, value);
+ }
+ chain-set-colour(index, key, value) => {
+ root.chain-set-colour(index, key, value);
+ }
+ cutout-mode(mode) => { root.cutout-mode(mode); }
+ cutout-tool(index) => { root.cutout-tool(index); }
+ cutout-size(size) => { root.cutout-size(size); }
+ cutout-painting(on) => { root.cutout-painting(on); }
+ cutout-subject(index) => { root.cutout-subject(index); }
+ cutout-clear => { root.cutout-clear(); }
}
- chain-set-colour(index, key, value) => {
- root.chain-set-colour(index, key, value);
+
+ if !root.is-image && !root.is-shape: SpeedPanel {
+ first: false;
+ selected: root.selected;
+ set(field, value) => { root.clip-set(field, value); }
+ commit => { root.clip-commit(); }
}
- cutout-mode(mode) => { root.cutout-mode(mode); }
- cutout-tool(index) => { root.cutout-tool(index); }
- cutout-size(size) => { root.cutout-size(size); }
- cutout-painting(on) => { root.cutout-painting(on); }
- cutout-subject(index) => { root.cutout-subject(index); }
- cutout-clear => { root.cutout-clear(); }
}
if root.showing == "Enhance": EnhancePanel {