EffectCraft: An open-source motion graphics and compositing tool written by scratch in pure Rust
Merge remote-tracking branch 'origin/main' into enhance/batch-parent-matte
tylerjenningsw5f22e63e934e
diff --cc crates/engine/src/cmd/layer/parent.rsindex 798702266,fbaec14e4..dc6298b85--- a/crates/engine/src/cmd/layer/parent.rs+++ b/crates/engine/src/cmd/layer/parent.rs@@@ -1,4 -1,4 +1,4 @@@- use super::*;-use super::{Comp, EngineError, ItemId, KV, Layer, LayerId, PropGroup, Result, Session, Tick, Value, b_p, bad, layers_p, resolve_layer};++use super::{Comp, EngineError, ItemId, KV, Layer, LayerId, PropGroup, Result, Session, Tick, Value, b_p, bad, layers_p, resolve_layer, unlocked};/// Re-express a layer in its new parent space without moving its anchor.pub(crate) struct ParentFix {diff --cc crates/engine/src/cmd/layer/switches.rsindex 834b93f36,38689afbb..7679d34fa--- a/crates/engine/src/cmd/layer/switches.rs+++ b/crates/engine/src/cmd/layer/switches.rs@@@ -1,4 -1,7 +1,7 @@@- use super::*;+ use super::{+ BlendMode, EngineError, FrameBlend, ItemId, KV, Layer, LayerId, MatteKind, Quality, Result, Session, TrackMatte, Value, b_p, bad, json, layer_mut, layer_p,- layers_p, merge_p, resolve_layer, str_p,++ layers_p, merge_p, resolve_layer, str_p, unlocked,+ };pub(super) fn set_switch(s: &mut Session, p: &Value) -> Result<Value> {let (cid, ids) = layers_p(s, p)?;diff --cc crates/ui-egui/src/panels/timeline.rsindex a116ec2a8,30b93e62e..b71f793af--- a/crates/ui-egui/src/panels/timeline.rs+++ b/crates/ui-egui/src/panels/timeline.rs@@@ -171,14 -170,15 +172,20 @@@ fn pick_whip_id() -> egui::Idegui::Id::unique("tl-pickwhip")}+/// The layers a layer pick whip (parent, track matte) links, taken as its drag starts.+fn whip_layers_id() -> egui::Id {+ egui::Id::unique("tl-pickwhip-layers")+}++ /// The automation id, label and hover hint of a pick whip.+ struct WhipText<'a> {+ auto: &'a str,+ label: &'a str,+ hint: &'a str,+ }+/// A pick whip at `rect`: dragging it starts a pick whip of `kind` from `layer`'s `prop` (0 for/// the layer's own), drawn and dropped at the end of [`show`].- #[allow(clippy::too_many_arguments)]fn pick_whip(app: &mut EffectcraftApp,ui: &egui::Ui,@@@ -2119,1108 -2708,1453 +2725,1470 @@@ fn pick_whip_edge_scroll(app: &mut Effe}}app.ui.timeline.scroll_y = app.ui.timeline.scroll_y.clamp(0.0, max_scroll);- let snap_project = app.session.project.clone();- let snap_expr = app.session.expr.clone();- let ectx = EvalCtx { project: &snap_project, comp_id: cid, comp: &comp, time, expr: snap_expr.as_deref(), footage: None };- let lp = p.with_clip_rect(rows_rect.intersect(Rect::from_min_max(rows_rect.min, pos2(graph_x0 - 1.0, rows_rect.max.y))));- let gp = p.with_clip_rect(rows_rect.intersect(Rect::from_min_max(pos2(graph_x0, rows_rect.min.y), rows_rect.max)));- let mut y = rows_rect.min.y - app.ui.timeline.scroll_y;- let selected = app.session.state.selected_layers.clone();- let sel_keys = app.session.state.selected_keys.clone();- let mut ui_actions: Vec<UiAct> = Vec::new();- let idx_of = |id: LayerId| comp.index_of(id).unwrap_or(0);- let graph_on = app.ui.timeline.graph_editor;- super::graph::track_open(ui.ctx(), graph_on);- let full_clip = ui.clip_rect();- let left_clip = full_clip.intersect(Rect::from_min_max(pos2(rect.min.x, rows_rect.min.y), pos2(graph_x0 - 1.0, rows_rect.max.y)));- let right_clip = full_clip.intersect(Rect::from_min_max(pos2(graph_x0, rows_rect.min.y), rows_rect.max));- // Registered before the rows so keys, bars and editors on top of it get the pointer first.- let empty_rect = if graph_on { Rect::NOTHING } else { Rect::from_min_max(pos2(graph_x0, rows_rect.min.y), rows_rect.max) };- let empty = ui.interact(empty_rect, egui::Id::unique("tl-graph-bg"), Sense::click_and_drag());- let outline_rect = Rect::from_min_max(rows_rect.min, pos2(graph_x0 - 1.0, rows_rect.max.y));- let outline_empty = ui.interact(outline_rect, egui::Id::unique("tl-layer-bg"), Sense::click_and_drag());- app.auto.add("timeline.layerMarquee", outline_rect, "Drag empty outline to select layers");- let mut hit_rows: Vec<(Rect, Row)> = vec![];- // The value fields of multi-dimension properties (per dimension), for the pick whip.- let mut dim_hits: Vec<(u64, Vec<Rect>)> = vec![];- // Rows stripe by their index among the rows that are not expression editors, so adding or- // removing an expression leaves every other row's stripe alone; an editor takes the index- // (and so the stripe) of its property's row, the one just above.- let mut striped = 0usize;- for row in rows.iter() {- let ri = if matches!(row.kind, RowKind::Expr { .. }) {- striped.saturating_sub(1)+ }++ fn layer_row_background(g: &Rw, rc: &RowCtx<'_>) {+ let t = g.tl.t;+ let rect = g.tl.rect;+ let graph_x0 = g.tl.graph_x0;+ let lp = g.lp.clone();+ let gp = g.gp.clone();+ let r = rc.r;+ let left = rc.left;+ let is_sel = rc.is_sel;+ lp.rect_filled(left, 0.0, if is_sel { t.row_selected } else { t.row_alt });+ gp.rect_filled(Rect::from_min_max(pos2(graph_x0, r.min.y), r.max), 0.0, if is_sel { t.tl_graph_selected } else { t.tl_bg });+ lp.line_segment([pos2(rect.min.x, r.max.y - 0.5), pos2(graph_x0, r.max.y - 0.5)], Stroke::new(1.0, t.app_bg));+ gp.line_segment([pos2(graph_x0, r.max.y - 0.5), pos2(r.max.x, r.max.y - 0.5)], Stroke::new(1.0, t.app_bg));+ }++ /// The A/V feature switches (video, audio, solo, lock).+ fn layer_av_switches(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>) {+ let t = g.tl.t;+ let vis = g.tl.vis;+ let comp = g.tl.comp.clone();+ let cw = &g.tl.cw;+ let actions = &mut g.tl.actions;+ let lp = g.lp.clone();+ let selected = &g.selected;+ let layer = rc.layer;+ let r = rc.r;+ let cy = rc.cy;+ let sw = &layer.switches;+ // Every layer has the Video switch (the eye), nulls, cameras and lights included,+ // as in After Effects: it hides a null's outline in the viewer and turns a camera or+ // light off.+ let av_items: [(Icon, bool, &str, bool); 4] = [+ (Icon::Eye, sw.video, "video", switch_applies(layer, "video", &app.session.project)),+ (Icon::Speaker, sw.audio, "audio", switch_applies(layer, "audio", &app.session.project)),+ (Icon::Solo, sw.solo, "solo", switch_applies(layer, "solo", &app.session.project)),+ (Icon::Lock, sw.locked, "lock", switch_applies(layer, "lock", &app.session.project)),+ ];+ for (i, (icon, on, name, applicable)) in av_items.into_iter().enumerate() {+ let br = Rect::from_center_size(pos2(cw.av + 10.0 + 18.0 * i as f32, cy), vec2(15.0, 15.0));+ if !applicable || !vis.av {+ continue;+ }+ lp.rect_filled(br.shrink(0.5), 1.0, t.switch_well);+ layer_switch(+ ui,+ &t,+ &SwitchSpec { row: r, br, icon, on, id: egui::Id::unique(("av", layer.id.0, i)), layer: layer.id.0, name, others: true },+ &comp,+ &app.session.project,+ selected,+ &mut *actions,+ );+ app.auto.add(&format!("timeline.layer.{}.{name}", layer.id.0), br, name);+ }+ }++ /// The label swatch and its colour menu.+ fn layer_label_swatch(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>) {+ let t = g.tl.t;+ let vis = g.tl.vis;+ let cw = &g.tl.cw;+ let actions = &mut g.tl.actions;+ let lp = g.lp.clone();+ let selected = &g.selected;+ let layer = rc.layer;+ let cy = rc.cy;+ // Label swatch.+ if vis.label {+ let lr = Rect::from_center_size(pos2(cw.label + 10.0, cy), vec2(12.0, 12.0));+ lp.rect_filled(lr, 2.0, t.label(layer.label));+ let lresp = ui.interact(lr, egui::Id::unique(("label", layer.id.0)), Sense::click());+ app.auto.add(&format!("timeline.layer.{}.label", layer.id.0), lr, layer.label.name());+ // Click (or right-click) the swatch for the label menu (After Effects).+ let pop = egui::Id::unique(("label-pop", layer.id.0));+ if lresp.clicked() || lresp.secondary_clicked() {+ widgets::open_popup(ui, pop);+ }+ if let Some(lab) = widgets::label_popup(ui, pop, lr.left_bottom(), layer.label, |l| app.session.prefs.label_name(l), &t) {+ actions.push(("edit.label".into(), json!({"layers": edited_layers(layer.id, selected), "label": lab.name()})));+ }+ }+ }++ fn layer_number_and_cells(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>) {+ let t = g.tl.t;+ let vis = g.tl.vis;+ let comp = g.tl.comp.clone();+ let cw = &g.tl.cw;+ let actions = &mut g.tl.actions;+ let lp = g.lp.clone();+ let layer = rc.layer;+ let cy = rc.cy;+ if vis.num {+ lp.text(pos2(cw.num + 13.0, cy), Align2::CENTER_CENTER, format!("{}", comp.index_of(layer.id).unwrap_or(0)), Tokens::ui(11.5), t.text_dim);+ }+ layer_cells(app, ui, &lp, cw, &comp, rc, &mut *actions);+ }++ /// The row's click target, twirl, icon and guide mark; returns the row response and the name's x.+ fn layer_twirl_and_icon(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>) -> (egui::Response, f32) {+ let t = g.tl.t;+ let vis = g.tl.vis;+ let cw = &g.tl.cw;+ let lp = g.lp.clone();+ let ui_actions = &mut g.ui_actions;+ let layer = rc.layer;+ let r = rc.r;+ let cy = rc.cy;+ // Row click → select; double-click → rename; drag → reorder. Registered before the+ // twirl and the name field so those sit on top and get their clicks.+ let row_x0 = if vis.num { cw.num } else { cw.name + 16.0 };+ let row_resp =+ ui.interact(Rect::from_min_max(pos2(row_x0, r.min.y), pos2(cw.name_end, r.max.y)), egui::Id::unique(("row", layer.id.0)), Sense::click_and_drag());+ // Twirl + icon + name.+ let tw = Rect::from_center_size(pos2(cw.name + 8.0, cy), vec2(14.0, 14.0));+ let open = app.ui.timeline.open_layers.contains(&layer.id.0);+ if widgets::twirl(ui, tw, open, egui::Id::unique(("twirl", layer.id.0)), &t).clicked() {+ ui_actions.push(UiAct::ToggleLayer(layer.id.0, ui.input(|i| i.modifiers.alt || i.modifiers.command)));+ }+ app.auto.add(&format!("timeline.layer.{}.twirl", layer.id.0), tw, "twirl");+ icons::paint(&lp, Rect::from_center_size(pos2(cw.name + 24.0, cy), vec2(13.0, 13.0)), layer_icon(layer, &app.session.project), t.text_dim);+ // A guide layer carries a guide mark before its name (After Effects).+ let name_x = if layer.switches.guide {+ let mark = Rect::from_center_size(pos2(cw.name + 40.0, cy), vec2(11.0, 11.0));+ icons::paint(&lp, mark, Icon::Grid, t.text_dim);+ app.auto.add(&format!("timeline.layer.{}.guide", layer.id.0), mark, "Guide Layer");+ cw.name + 50.0+ } else {+ cw.name + 34.0+ };+ (row_resp, name_x)+ }++ /// The layer name: the rename field or the (selected) name cell.+ fn layer_name(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>, name_x: f32) {+ let t = g.tl.t;+ let ctx = g.tl.ctx.clone();+ let cw = &g.tl.cw;+ let actions = &mut g.tl.actions;+ let lp = g.lp.clone();+ let layer = rc.layer;+ let r = rc.r;+ let cy = rc.cy;+ let is_sel = rc.is_sel;+ let name_rect = Rect::from_min_max(pos2(name_x, r.min.y), pos2(cw.name_end - 4.0, r.max.y));+ let rename_id = egui::Id::unique("tl-rename");+ let renaming: Option<(u64, String)> = ctx.data(|d| d.get_temp(rename_id));+ if let Some((rl, mut buf)) = renaming.filter(|(rl, _)| *rl == layer.id.0) {+ let mut child = ui.new_child(egui::UiBuilder::new().max_rect(name_rect.shrink2(vec2(0.0, 2.0))));+ let er = child.add(egui::TextEdit::singleline(&mut buf).font(Tokens::ui(12.0)).desired_width(name_rect.width()));+ app.auto.add(&format!("timeline.layer.{rl}.nameEdit"), er.rect, &buf);+ if ctx.data_mut(|d| d.remove_temp::<bool>(rename_focus_id())).unwrap_or(false) {+ // Just started: focus the field with the whole name selected.+ er.request_focus();+ widgets::select_all(&ctx, er.id, &buf);+ }+ if er.lost_focus() {+ if !ui.input(|i| i.key_pressed(egui::Key::Escape)) {+ actions.push(("layer.rename".into(), json!({"layer": rl, "name": buf})));+ }+ ctx.data_mut(|d| d.remove::<(u64, String)>(rename_id));} else {- striped += 1;- striped - 1- };- // Outline widgets never spill into the time graph (narrow timelines).- ui.set_clip_rect(left_clip);- let hh = row_height(row, rh);- let r = Rect::from_min_size(pos2(rect.min.x, y), vec2(rect.width(), hh));- y += hh;- if r.max.y < rows_rect.min.y || r.min.y > rows_rect.max.y {+ ctx.data_mut(|d| d.insert_temp(rename_id, (rl, buf)));+ }+ } else {+ // The selected layer's name sits in a light cell with dark text.+ let name_col = if is_sel { Color32::from_gray(0x16) } else { t.text };+ if is_sel {+ let g = lp.layout_no_wrap(display_name(app, layer), Tokens::ui(12.0), name_col);+ let cell = Rect::from_min_max(+ pos2(name_rect.min.x - 3.0, r.min.y + 1.0),+ pos2((name_rect.min.x + g.size().x + 4.0).max(cw.name_end - 4.0).min(cw.name_end - 2.0), r.max.y - 1.0),+ );+ lp.rect_filled(cell, 0.0, SELECTED_NAME_BG);+ }+ let lpn = lp.with_clip_rect(name_rect.intersect(lp.clip_rect()));+ lpn.text(pos2(name_rect.min.x, cy), Align2::LEFT_CENTER, display_name(app, layer), Tokens::ui(12.0), name_col);+ }+ }++ /// Row click, drag, double-click and context menu.+ fn layer_row_actions(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>, row_resp: &egui::Response) {+ let cid = g.tl.cid;+ let ctx = g.tl.ctx.clone();+ let comp = g.tl.comp.clone();+ let rows = &g.tl.rows;+ let actions = &mut g.tl.actions;+ let selected = &g.selected;+ let layer = rc.layer;+ let left = rc.left;+ let is_sel = rc.is_sel;+ // Locked layers can't be selected or moved (unlock them with the lock switch).+ let locked = layer.switches.locked;+ if row_resp.drag_started() && !locked {+ // The selected layers move together; an unselected row moves alone.+ let moving: Vec<u64> = if is_sel { comp.layers.iter().filter(|l| selected.contains(&l.id)).map(|l| l.id.0).collect() } else { vec![layer.id.0] };+ ctx.data_mut(|d| d.insert_temp(layer_drag_id(), moving));+ }+ if row_resp.drag_stopped() {+ ctx.data_mut(|d| d.insert_temp(layer_drop_id(), true));+ }+ app.auto.add(&format!("timeline.layer.{}.row", layer.id.0), left, &layer.name);+ if row_resp.clicked() && !locked {+ let m = ui.input(|i| i.modifiers);+ if let Some(layers) = m.shift.then(|| shift_range(&ctx, cid, &comp, rows, selected, layer.id)).flatten() {+ actions.push(("layer.select".into(), json!({"layers": layers})));+ } else {+ actions.push(("layer.select".into(), json!({"layers": [layer.id.0], "toggle": m.command})));+ set_anchor(&ctx, cid, layer.id);+ }+ }+ if row_resp.double_clicked() {+ match double_click_action(layer) {+ Some(a) => actions.push(a),+ None => start_rename(&ctx, layer.id.0, &layer.name),+ }+ }+ layer_context_menu(row_resp, &comp, layer, selected, LayerMenuCaps::of(&app.session.project, layer), &mut app.auto, &mut *actions);+ }++ /// The eight layer switches.+ fn layer_switches(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>) {+ let t = g.tl.t;+ let vis = g.tl.vis;+ let comp = g.tl.comp.clone();+ let cw = &g.tl.cw;+ let actions = &mut g.tl.actions;+ let lp = g.lp.clone();+ let selected = &g.selected;+ let layer = rc.layer;+ let r = rc.r;+ let cy = rc.cy;+ let sw = &layer.switches;+ let sws: [(Icon, bool, &str, bool); 8] = [+ (Icon::Shy, sw.shy, "shy", switch_applies(layer, "shy", &app.session.project)),+ (Icon::Collapse, sw.collapse, "collapse", switch_applies(layer, "collapse", &app.session.project)),+ (Icon::Quality, sw.quality == effectcraft_engine::project::Quality::Best, "quality", switch_applies(layer, "quality", &app.session.project)),+ (Icon::Fx, sw.effects, "fx", switch_applies(layer, "fx", &app.session.project)),+ (+ Icon::FrameBlend,+ sw.frame_blend != effectcraft_engine::project::FrameBlend::Off,+ "frameBlend",+ switch_applies(layer, "frameBlend", &app.session.project),+ ),+ (Icon::MotionBlur, sw.motion_blur, "motionBlur", switch_applies(layer, "motionBlur", &app.session.project)),+ (Icon::Adjustment, sw.adjustment, "adjustment", switch_applies(layer, "adjustment", &app.session.project)),+ (Icon::Cube, layer.is_3d(), "threeD", switch_applies(layer, "threeD", &app.session.project)),+ ];+ for (i, (icon, on, name, applicable)) in sws.into_iter().enumerate() {+ if !applicable || !vis.switches {continue;}- hit_rows.push((r, row.clone()));- let Some(layer) = comp.layer(row.layer) else { continue };- let is_sel = selected.contains(&layer.id);- let left = Rect::from_min_max(r.min, pos2(graph_x0 - 1.0, r.max.y));- let cy = r.min.y + rh / 2.0;- match &row.kind {- RowKind::Layer => {- // After Effects draws layer rows as one flat tone separated by dark hairlines- // (outline and time graph alike), not as alternating stripes.- let _ = ri;- lp.rect_filled(left, 0.0, if is_sel { t.row_selected } else { t.row_alt });- gp.rect_filled(Rect::from_min_max(pos2(graph_x0, r.min.y), r.max), 0.0, if is_sel { t.tl_graph_selected } else { t.tl_bg });- lp.line_segment([pos2(rect.min.x, r.max.y - 0.5), pos2(graph_x0, r.max.y - 0.5)], Stroke::new(1.0, t.app_bg));- gp.line_segment([pos2(graph_x0, r.max.y - 0.5), pos2(r.max.x, r.max.y - 0.5)], Stroke::new(1.0, t.app_bg));- // A/V features.- let sw = &layer.switches;- // Every layer has the Video switch (the eye), nulls, cameras and lights included,- // as in After Effects: it hides a null's outline in the viewer and turns a camera or- // light off.- let av_items: [(Icon, bool, &str, bool); 4] = [- (Icon::Eye, sw.video, "video", switch_applies(layer, "video", &app.session.project)),- (Icon::Speaker, sw.audio, "audio", switch_applies(layer, "audio", &app.session.project)),- (Icon::Solo, sw.solo, "solo", switch_applies(layer, "solo", &app.session.project)),- (Icon::Lock, sw.locked, "lock", switch_applies(layer, "lock", &app.session.project)),- ];- for (i, (icon, on, name, applicable)) in av_items.into_iter().enumerate() {- let br = Rect::from_center_size(pos2(cw.av + 10.0 + 18.0 * i as f32, cy), vec2(15.0, 15.0));- if !applicable || !vis.av {- continue;- }- lp.rect_filled(br.shrink(0.5), 1.0, t.switch_well);- layer_switch(- ui,- &t,- r,- br,- icon,- on,- egui::Id::unique(("av", layer.id.0, i)),- layer.id.0,- name,- true,- &comp,- &app.session.project,- &selected,- &mut actions,- );- app.auto.add(&format!("timeline.layer.{}.{name}", layer.id.0), br, name);- }- // Label swatch.- if vis.label {- let lr = Rect::from_center_size(pos2(cw.label + 10.0, cy), vec2(12.0, 12.0));- lp.rect_filled(lr, 2.0, t.label(layer.label));- let lresp = ui.interact(lr, egui::Id::unique(("label", layer.id.0)), Sense::click());- app.auto.add(&format!("timeline.layer.{}.label", layer.id.0), lr, layer.label.name());- // Click (or right-click) the swatch for the label menu (After Effects).- let pop = egui::Id::unique(("label-pop", layer.id.0));- if lresp.clicked() || lresp.secondary_clicked() {- widgets::open_popup(ui, pop);- }- if let Some(lab) = widgets::label_popup(ui, pop, lr.left_bottom(), layer.label, |l| app.session.prefs.label_name(l), &t) {- actions.push(("edit.label".into(), json!({"layers": edited_layers(layer.id, &selected), "label": lab.name()})));- }- }- if vis.num {- lp.text(pos2(cw.num + 13.0, cy), Align2::CENTER_CENTER, format!("{}", idx_of(layer.id)), Tokens::ui(11.5), t.text_dim);- }- layer_cells(app, ui, &lp, &cw, &comp, layer, r, cy, &mut actions);- // Row click → select; double-click → rename; drag → reorder. Registered before the- // twirl and the name field so those sit on top and get their clicks.- let row_x0 = if vis.num { cw.num } else { cw.name + 16.0 };- let row_resp = ui.interact(- Rect::from_min_max(pos2(row_x0, r.min.y), pos2(cw.name_end, r.max.y)),- egui::Id::unique(("row", layer.id.0)),- Sense::click_and_drag(),- );- // Twirl + icon + name.- let tw = Rect::from_center_size(pos2(cw.name + 8.0, cy), vec2(14.0, 14.0));- let open = app.ui.timeline.open_layers.contains(&layer.id.0);- if widgets::twirl(ui, tw, open, egui::Id::unique(("twirl", layer.id.0)), &t).clicked() {- ui_actions.push(UiAct::ToggleLayer(layer.id.0, ui.input(|i| i.modifiers.alt || i.modifiers.command)));- }- app.auto.add(&format!("timeline.layer.{}.twirl", layer.id.0), tw, "twirl");- icons::paint(&lp, Rect::from_center_size(pos2(cw.name + 24.0, cy), vec2(13.0, 13.0)), layer_icon(layer, &app.session.project), t.text_dim);- // A guide layer carries a guide mark before its name (After Effects).- let name_x = if layer.switches.guide {- let mark = Rect::from_center_size(pos2(cw.name + 40.0, cy), vec2(11.0, 11.0));- icons::paint(&lp, mark, Icon::Grid, t.text_dim);- app.auto.add(&format!("timeline.layer.{}.guide", layer.id.0), mark, "Guide Layer");- cw.name + 50.0- } else {- cw.name + 34.0- };- let name_rect = Rect::from_min_max(pos2(name_x, r.min.y), pos2(cw.name_end - 4.0, r.max.y));- let rename_id = egui::Id::unique("tl-rename");- let renaming: Option<(u64, String)> = ctx.data(|d| d.get_temp(rename_id));- if let Some((rl, mut buf)) = renaming.filter(|(rl, _)| *rl == layer.id.0) {- let mut child = ui.new_child(egui::UiBuilder::new().max_rect(name_rect.shrink2(vec2(0.0, 2.0))));- let er = child.add(egui::TextEdit::singleline(&mut buf).font(Tokens::ui(12.0)).desired_width(name_rect.width()));- app.auto.add(&format!("timeline.layer.{rl}.nameEdit"), er.rect, &buf);- if ctx.data_mut(|d| d.remove_temp::<bool>(rename_focus_id())).unwrap_or(false) {- // Just started: focus the field with the whole name selected.- er.request_focus();- widgets::select_all(&ctx, er.id, &buf);- }- if er.lost_focus() {- if !ui.input(|i| i.key_pressed(egui::Key::Escape)) {- actions.push(("layer.rename".into(), json!({"layer": rl, "name": buf})));- }- ctx.data_mut(|d| d.remove::<(u64, String)>(rename_id));- } else {- ctx.data_mut(|d| d.insert_temp(rename_id, (rl, buf)));- }- } else {- // The selected layer's name sits in a light cell with dark text.- let name_col = if is_sel { Color32::from_gray(0x16) } else { t.text };- if is_sel {- let g = lp.layout_no_wrap(display_name(app, layer), Tokens::ui(12.0), name_col);- let cell = Rect::from_min_max(- pos2(name_rect.min.x - 3.0, r.min.y + 1.0),- pos2((name_rect.min.x + g.size().x + 4.0).max(cw.name_end - 4.0).min(cw.name_end - 2.0), r.max.y - 1.0),- );- lp.rect_filled(cell, 0.0, SELECTED_NAME_BG);- }- let lpn = lp.with_clip_rect(name_rect.intersect(lp.clip_rect()));- lpn.text(pos2(name_rect.min.x, cy), Align2::LEFT_CENTER, display_name(app, layer), Tokens::ui(12.0), name_col);- }- // Locked layers can't be selected or moved (unlock them with the lock switch).- let locked = layer.switches.locked;- if row_resp.drag_started() && !locked {- // The selected layers move together; an unselected row moves alone.- let moving: Vec<u64> =- if is_sel { comp.layers.iter().filter(|l| selected.contains(&l.id)).map(|l| l.id.0).collect() } else { vec![layer.id.0] };- ctx.data_mut(|d| d.insert_temp(layer_drag_id(), moving));- }- if row_resp.drag_stopped() {- ctx.data_mut(|d| d.insert_temp(layer_drop_id(), true));- }- app.auto.add(&format!("timeline.layer.{}.row", layer.id.0), left, &layer.name);- if row_resp.clicked() && !locked {- let m = ui.input(|i| i.modifiers);- if let Some(layers) = m.shift.then(|| shift_range(&ctx, cid, &comp, &rows, &selected, layer.id)).flatten() {- actions.push(("layer.select".into(), json!({"layers": layers})));- } else {- actions.push(("layer.select".into(), json!({"layers": [layer.id.0], "toggle": m.command})));- set_anchor(&ctx, cid, layer.id);- }- }- if row_resp.double_clicked() {- match double_click_action(layer) {- Some(a) => actions.push(a),- None => start_rename(&ctx, layer.id.0, &layer.name),- }- }- layer_context_menu(&row_resp, &comp, layer, &selected, LayerMenuCaps::of(&app.session.project, layer), &mut app.auto, &mut actions);- // Switches.- let sws: [(Icon, bool, &str, bool); 8] = [- (Icon::Shy, sw.shy, "shy", switch_applies(layer, "shy", &app.session.project)),- (Icon::Collapse, sw.collapse, "collapse", switch_applies(layer, "collapse", &app.session.project)),- (- Icon::Quality,- sw.quality == effectcraft_engine::project::Quality::Best,- "quality",- switch_applies(layer, "quality", &app.session.project),- ),- (Icon::Fx, sw.effects, "fx", switch_applies(layer, "fx", &app.session.project)),- (- Icon::FrameBlend,- sw.frame_blend != effectcraft_engine::project::FrameBlend::Off,- "frameBlend",- switch_applies(layer, "frameBlend", &app.session.project),- ),- (Icon::MotionBlur, sw.motion_blur, "motionBlur", switch_applies(layer, "motionBlur", &app.session.project)),- (Icon::Adjustment, sw.adjustment, "adjustment", switch_applies(layer, "adjustment", &app.session.project)),- (Icon::Cube, layer.is_3d(), "threeD", switch_applies(layer, "threeD", &app.session.project)),- ];- for (i, (icon, on, name, applicable)) in sws.into_iter().enumerate() {- if !applicable || !vis.switches {- continue;- }- let br = Rect::from_center_size(pos2(cw.switches + SW * i as f32 + SW / 2.0, cy), vec2(16.0, 16.0));- lp.rect_filled(br.shrink(1.0), 1.0, t.switch_well);- layer_switch(- ui,- &t,- r,- br,- icon,- on,- egui::Id::unique(("sw", layer.id.0, i)),- layer.id.0,- name,- false,- &comp,- &app.session.project,- &selected,- &mut actions,- );- app.auto.add(&format!("timeline.layer.{}.switch.{name}", layer.id.0), br, name);- }- // Modes.- if app.ui.timeline.show_modes && layer.source.is_av() {- let mr = Rect::from_min_size(pos2(cw.mode + 2.0, cy - 9.0), vec2(80.0, 18.0));- let mresp = widgets::dropdown(ui, mr, layer.blend_mode.label(), &t, egui::Id::unique(("mode", layer.id.0)));- app.auto.add(&format!("timeline.layer.{}.mode", layer.id.0), mr, "Mode");- let pop = egui::Id::unique(("mode-pop", layer.id.0));- if mresp.clicked() {- widgets::open_popup(ui, pop);- }- let opts: Vec<String> = BlendMode::ALL- .iter()- .flat_map(|m| if m.ends_group() { vec![m.label().to_string(), "-".to_string()] } else { vec![m.label().to_string()] })- .collect();- if let Some(i) = widgets::popup_menu(ui, pop, mr.left_bottom(), &opts, opts.iter().position(|o| o == layer.blend_mode.label())) {- actions.push(("layer.setBlendMode".into(), json!({"layers": video_targets(&comp, layer.id, &selected), "mode": opts[i]})));- }- let tr = Rect::from_center_size(pos2(cw.mode + 76.0 + 6.0, cy), vec2(14.0, 14.0));- app.auto.add(&format!("timeline.layer.{}.preserveTransparency", layer.id.0), tr, "Preserve Transparency");- if widgets::checkbox(ui, tr, layer.preserve_transparency, &t, egui::Id::unique(("pt", layer.id.0))).clicked() {- // The click gives the selection the state the clicked row toggles to,- // whatever the first selected layer's value (as the switches do).- actions.push((- "layer.setSwitch".into(),- json!({- "layers": video_targets(&comp, layer.id, &selected),- "switch": "preserveTransparency",- "value": !layer.preserve_transparency- }),- ));- }- // Track matte: a pick whip, then the layer picker with the mode. Like the parent,- // they set the matte of every selected layer when the row is selected (#1260).- pick_whip(- app,- ui,- &lp,- Rect::from_center_size(pos2(cw.trkmat + 9.0, cy), vec2(15.0, 15.0)),- (WHIP_MATTE, layer.id.0, 0),- &format!("timeline.layer.{}.trackMattePickWhip", layer.id.0),- "Track Matte pick whip",- crate::i18n::tr("Track Matte pick whip: drag onto a layer"),- );- let mr = Rect::from_min_size(pos2(cw.trkmat + 20.0, cy - 9.0), vec2(88.0, 18.0));- let label = match layer.track_matte {- Some(m) => comp.layer(m.layer).map(|l| format!("{} {}", idx_of(l.id), l.name)).unwrap_or("None".into()),- None => "No Track Matte".into(),- };- // The cell is too narrow for the mode as well: it is in the tooltip and ticked in the menu.- let tip = layer.track_matte.map(|m| format!("{label} · {}", crate::i18n::tr(m.kind.label())));- let tresp = widgets::dropdown_tip(ui, mr, &label, tip.as_deref(), &t, egui::Id::unique(("trkmat", layer.id.0)));- app.auto.add(&format!("timeline.layer.{}.trackMatte", layer.id.0), mr, "Track Matte");- let pop = egui::Id::unique(("trk-pop", layer.id.0));- if tresp.clicked() {- widgets::open_popup(ui, pop);- }- // The menu lists every layer: built only while it is open (per visible row- // it made a big comp's timeline quadratic).- let mut opts = vec!["No Track Matte".to_string(), "-".to_string()];- let mut candidates: Vec<&Layer> = vec![];- if widgets::popup_is_open(ui, pop) {- for (i, l) in comp.layers.iter().enumerate().filter(|(_, l)| l.id != layer.id && l.source.is_av()) {- opts.push(format!("{}. {}", i + 1, l.name));- candidates.push(l);- }- opts.push("-".into());- for k in MatteKind::ALL {- opts.push(k.label().into());- }- }- let current = layer.track_matte.and_then(|m| opts.iter().position(|o| o == m.kind.label()));- if let Some(i) = widgets::popup_menu(ui, pop, mr.left_bottom(), &opts, current) {- let ids: Vec<LayerId> = candidates.iter().map(|l| l.id).collect();- if let Some(a) = opts.get(i).and_then(|o| track_matte_pick(&video_targets(&comp, layer.id, &selected), &ids, i, o)) {- actions.push(a);- }- }- if layer.track_matte.is_some() {- let kr = Rect::from_center_size(pos2(mr.max.x - 26.0, cy), vec2(10.0, 10.0));- let _ = kr;- }- }- // Parent.- if vis.parent {- pick_whip(- app,- ui,- &lp,- Rect::from_center_size(pos2(cw.parent + 9.0, cy), vec2(15.0, 15.0)),- (WHIP_PARENT, layer.id.0, 0),- &format!("timeline.layer.{}.pickWhip", layer.id.0),- "Parent pick whip",- crate::i18n::tr("Parent pick whip: drag onto a layer"),- );- let pr_rect = Rect::from_min_size(pos2(cw.parent + 20.0, cy - 9.0), vec2(94.0, 18.0));- let plabel = layer.parent.and_then(|p| comp.layer(p)).map(|l| format!("{}. {}", idx_of(l.id), l.name)).unwrap_or_else(|| "None".into());- let presp = widgets::dropdown(ui, pr_rect, &plabel, &t, egui::Id::unique(("parent", layer.id.0)));- app.auto.add(&format!("timeline.layer.{}.parent", layer.id.0), pr_rect, "Parent");- let pop = egui::Id::unique(("par-pop", layer.id.0));- if presp.clicked() {- widgets::open_popup(ui, pop);- }- let mut cands: Vec<&Layer> = vec![];- let mut popts = vec!["None".to_string(), "-".to_string()];- if widgets::popup_is_open(ui, pop) {- for (i, l) in comp.layers.iter().enumerate().filter(|(_, l)| l.id != layer.id) {- popts.push(format!("{}. {}", i + 1, l.name));- cands.push(l);- }- }- if let Some(i) = widgets::popup_menu(ui, pop, pr_rect.left_bottom(), &popts, None) {- let par = cands.get(i.wrapping_sub(2)).map(|l| l.id.0);- // (The new parent itself, if selected, stays as it is.)- let layers: Vec<u64> = edited_layers(layer.id, &selected).into_iter().filter(|l| Some(*l) != par).collect();- actions.push(("layer.setParent".into(), json!({"layers": layers, "parent": par})));- }- }- // Layer bar.- ui.set_clip_rect(right_clip);- if !graph_on {- let x_in = tm.x(layer.in_point.seconds());- let x_out = tm.x(layer.out_point.seconds());- let bar = Rect::from_min_max(pos2(x_in, r.min.y + 1.0), pos2(x_out, r.max.y - 1.0));- let lc = t.label(layer.label);- let fill = bar_color(lc, is_sel);- gp.rect_filled(bar, 0.0, fill);- if is_sel {- gp.rect_stroke(bar, 0.0, Stroke::new(1.0, Color32::from_white_alpha(90)), StrokeKind::Inside);- }- // Source extent (e.g. trimmed footage) shown faint.- if let LayerSource::Footage { .. } | LayerSource::Comp { .. } = layer.source- && let Some(d) = layer.source.item().and_then(|i| app.session.project.item(i)).and_then(|i| i.duration())- {- let xs = tm.x(layer.start_time.seconds());- let xe = tm.x(layer.comp_time(d).seconds());- let ghost = Rect::from_min_max(pos2(xs.min(xe), r.min.y + 9.0), pos2(xs.max(xe), r.max.y - 9.0));- gp.rect_filled(ghost, 1.0, lc.gamma_multiply(0.18));- // The bar past the source's end (its last frame held) or before its start- // is striped, so the source's own span shows (#290). Time remapping- // decides what shows there itself.- if layer.props.get("timeRemap").is_none() {- for (side, part) in [- ("beforeSource", Rect::from_min_max(bar.min, pos2(ghost.min.x, bar.max.y))),- ("afterSource", Rect::from_min_max(pos2(ghost.max.x, bar.min.y), bar.max)),- ] {- if part.width() >= 1.0 {- stripes(&gp, part, lc);- app.auto.add(&format!("timeline.layer.{}.bar.{side}", layer.id.0), part, "Past the source");- }- }- }- // Dragging the source bar outside the in/out span slips the source.- for (side, gr) in [- ("l", Rect::from_min_max(ghost.min, pos2(bar.min.x, ghost.max.y))),- ("r", Rect::from_min_max(pos2(bar.max.x, ghost.min.y), ghost.max)),- ] {- if gr.width() < 2.0 {- continue;- }- let gresp = ui- .interact(gr, egui::Id::unique(("ghost", side, layer.id.0)), Sense::click_and_drag())- .on_hover_text(crate::i18n::tr("Drag to slip the source"));- // Outside the bar it is empty track area: a plain click deselects.- if gresp.clicked() && !ui.input(|i| i.modifiers.shift || i.modifiers.command) {- actions.push(("layer.select".into(), json!({"layers": []})));- }- app.auto.add(&format!("timeline.layer.{}.source{}", layer.id.0, side), gr, "Slip");- if gresp.hovered() || gresp.dragged() {- ctx.set_cursor_icon(egui::CursorIcon::ResizeHorizontal);- }- let acc_id = egui::Id::unique(("slip-acc", layer.id.0));- if gresp.dragged() {- let mut acc: f32 = ctx.data(|d| d.get_temp(acc_id).unwrap_or(0.0));- acc += gresp.drag_delta().x;- let frames = ((acc as f64 / pps) / fd).trunc() as i64;- if frames != 0 {- acc -= (frames as f64 * fd * pps) as f32;- actions.push((- "layer.slip".into(),- json!({"layers": [layer.id.0], "frames": frames, "merge": format!("slip-{}", layer.id.0)}),- ));- }- ctx.data_mut(|d| d.insert_temp(acc_id, acc));- }- if gresp.drag_stopped() {- ctx.data_mut(|d| d.remove::<f32>(acc_id));- ui_actions.push(UiAct::EndMerge);- }- }- }- app.auto.add(&format!("timeline.layer.{}.bar", layer.id.0), bar, &layer.name);- // Interactions: move body, trim edges.- let (body_r, in_r, out_r) = trim_zones(bar);- let body = ui.interact(body_r, egui::Id::unique(("bar", layer.id.0)), Sense::click_and_drag());- let lin = ui.interact(in_r, egui::Id::unique(("bar-in", layer.id.0)), Sense::drag());- let lout = ui.interact(out_r, egui::Id::unique(("bar-out", layer.id.0)), Sense::drag());- app.auto.add(&format!("timeline.layer.{}.bar.in", layer.id.0), in_r, "Trim In");- app.auto.add(&format!("timeline.layer.{}.bar.out", layer.id.0), out_r, "Trim Out");- if lin.hovered() || lout.hovered() || lin.dragged() || lout.dragged() {- trim_cursor(&ctx);- }- if body.double_clicked()- && let Some(a) = double_click_action(layer)- {- actions.push(a);- }- let shift = ui.input(|i| i.modifiers.shift);- if let Some(layers) = (body.clicked() && shift).then(|| shift_range(&ctx, cid, &comp, &rows, &selected, layer.id)).flatten() {- // Shift-click: the layers from the last one clicked to this one, as in- // the layer outline.- actions.push(("layer.select".into(), json!({"layers": layers})));- } else {- if (body.clicked() || body.drag_started()) && !is_sel {- actions.push(("layer.select".into(), json!({"layers": [layer.id.0], "add": shift})));- }- if (body.clicked() || body.drag_started()) && !shift {- set_anchor(&ctx, cid, layer.id);- }- }- layer_context_menu(&body, &comp, layer, &selected, LayerMenuCaps::of(&app.session.project, layer), &mut app.auto, &mut actions);- let drag_key = format!("bar-{}", layer.id.0);- // Ctrl/Cmd+Alt dragging a selected bar: Quick Offset (#1012), chosen as the- // drag starts and followed below the rows until the button is released.- let mods = ui.input(|i| i.modifiers);- if body.drag_started()- && is_sel- && mods.command- && mods.alt- && let Some(n) = quick_offset_layers(&comp, selected.iter().copied())- && let Some(p) = ctx.input(|i| i.pointer.press_origin())- {- ctx.data_mut(|d| d.insert_temp(quick_bar_id(), QuickBar { layer: layer.id, origin_x: p.x, layers: n, applied: 0 }));- }- let quick = ctx.data(|d| d.get_temp::<QuickBar>(quick_bar_id())).is_some_and(|q| q.layer == layer.id);- for (resp, kind) in [(&body, "move"), (&lin, "in"), (&lout, "out")] {- if kind == "move" && quick {- continue;- }- if resp.dragged() {- let acc_id = egui::Id::unique(("bar-acc", layer.id.0, kind));- let mut acc: f32 = ctx.data(|d| d.get_temp(acc_id).unwrap_or(0.0));- acc += resp.drag_delta().x;- let frames = ((acc as f64 / pps) / fd).trunc() as i64;- if frames != 0 {- acc -= (frames as f64 * fd * pps) as f32;- let d = frames as f64 * fd;- // Moving or trimming a selected layer acts on the whole- // selection; each layer trims from its own in/out point.- let targets = json!(edited_layers(layer.id, &selected));- let params = match kind {- "move" => json!({"layers": targets, "delta": d, "merge": drag_key}),- "in" => json!({"layers": targets, "inDelta": d, "merge": drag_key}),- _ => json!({"layers": targets, "outDelta": d, "merge": drag_key}),- };- actions.push(("layer.timing".into(), params));- }- ctx.data_mut(|d| d.insert_temp(acc_id, acc));- }- if resp.drag_stopped() {- ctx.data_mut(|d| d.remove::<f32>(egui::Id::unique(("bar-acc", layer.id.0, kind))));- ui_actions.push(UiAct::EndMerge);- }- }- // Markers on the layer (drag, Alt-drag duration, Cmd-click delete, dialog).- let gclip = rows_rect.intersect(Rect::from_min_max(pos2(graph_x0, rows_rect.min.y), rows_rect.max));- super::markers_ui::layer_markers(app, ui, gclip, &comp, layer, tm, r);+ let br = Rect::from_center_size(pos2(cw.switches + SW * i as f32 + SW / 2.0, cy), vec2(16.0, 16.0));+ lp.rect_filled(br.shrink(1.0), 1.0, t.switch_well);+ layer_switch(+ ui,+ &t,+ &SwitchSpec { row: r, br, icon, on, id: egui::Id::unique(("sw", layer.id.0, i)), layer: layer.id.0, name, others: false },+ &comp,+ &app.session.project,+ selected,+ &mut *actions,+ );+ app.auto.add(&format!("timeline.layer.{}.switch.{name}", layer.id.0), br, name);+ }+ }++ /// The blend mode dropdown and Preserve Transparency.+ fn layer_mode_cell(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>) {+ let t = g.tl.t;+ let comp = g.tl.comp.clone();+ let cw = &g.tl.cw;+ let actions = &mut g.tl.actions;+ let selected = &g.selected;+ let layer = rc.layer;+ let cy = rc.cy;+ let mr = Rect::from_min_size(pos2(cw.mode + 2.0, cy - 9.0), vec2(80.0, 18.0));+ let mresp = widgets::dropdown(ui, mr, layer.blend_mode.label(), &t, egui::Id::unique(("mode", layer.id.0)));+ app.auto.add(&format!("timeline.layer.{}.mode", layer.id.0), mr, "Mode");+ let pop = egui::Id::unique(("mode-pop", layer.id.0));+ if mresp.clicked() {+ widgets::open_popup(ui, pop);+ }+ let opts: Vec<String> =+ BlendMode::ALL.iter().flat_map(|m| if m.ends_group() { vec![m.label().to_string(), "-".to_string()] } else { vec![m.label().to_string()] }).collect();+ if let Some(i) = widgets::popup_menu(ui, pop, mr.left_bottom(), &opts, opts.iter().position(|o| o == layer.blend_mode.label())) {- actions.push(("layer.setBlendMode".into(), json!({"layers": mode_targets(&comp, layer.id, selected), "mode": opts[i]})));++ actions.push(("layer.setBlendMode".into(), json!({"layers": video_targets(&comp, layer.id, selected), "mode": opts[i]})));+ }+ let tr = Rect::from_center_size(pos2(cw.mode + 76.0 + 6.0, cy), vec2(14.0, 14.0));+ app.auto.add(&format!("timeline.layer.{}.preserveTransparency", layer.id.0), tr, "Preserve Transparency");+ if widgets::checkbox(ui, tr, layer.preserve_transparency, &t, egui::Id::unique(("pt", layer.id.0))).clicked() {+ // The click gives the selection the state the clicked row toggles to,+ // whatever the first selected layer's value (as the switches do).+ actions.push((+ "layer.setSwitch".into(),+ json!({- "layers": mode_targets(&comp, layer.id, selected),++ "layers": video_targets(&comp, layer.id, selected),+ "switch": "preserveTransparency",+ "value": !layer.preserve_transparency+ }),+ ));+ }+ }++ /// The track matte picker.+ fn layer_matte_cell(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>) {+ let t = g.tl.t;+ let comp = g.tl.comp.clone();+ let cw = &g.tl.cw;+ let actions = &mut g.tl.actions;++ let lp = g.lp.clone();++ let selected = &g.selected;+ let layer = rc.layer;+ let cy = rc.cy;- // Track matte: layer picker + kind.- let mr = Rect::from_min_size(pos2(cw.trkmat + 2.0, cy - 9.0), vec2(104.0, 18.0));++ // Track matte: a pick whip, then the layer picker with the mode. Like the parent, they set++ // the matte of every selected layer when the row is selected (#1260).++ pick_whip(++ app,++ ui,++ &lp,++ Rect::from_center_size(pos2(cw.trkmat + 9.0, cy), vec2(15.0, 15.0)),++ (WHIP_MATTE, layer.id.0, 0),++ WhipText {++ auto: &format!("timeline.layer.{}.trackMattePickWhip", layer.id.0),++ label: "Track Matte pick whip",++ hint: crate::i18n::tr("Track Matte pick whip: drag onto a layer"),++ },++ );++ let mr = Rect::from_min_size(pos2(cw.trkmat + 20.0, cy - 9.0), vec2(88.0, 18.0));+ let label = match layer.track_matte {+ Some(m) => comp.layer(m.layer).map(|l| format!("{} {}", comp.index_of(l.id).unwrap_or(0), l.name)).unwrap_or("None".into()),+ None => "No Track Matte".into(),+ };+ // The cell is too narrow for the mode as well: it is in the tooltip and ticked in the menu.+ let tip = layer.track_matte.map(|m| format!("{label} · {}", crate::i18n::tr(m.kind.label())));+ let tresp = widgets::dropdown_tip(ui, mr, &label, tip.as_deref(), &t, egui::Id::unique(("trkmat", layer.id.0)));+ app.auto.add(&format!("timeline.layer.{}.trackMatte", layer.id.0), mr, "Track Matte");+ let pop = egui::Id::unique(("trk-pop", layer.id.0));+ if tresp.clicked() {+ widgets::open_popup(ui, pop);+ }+ // The menu lists every layer: built only while it is open (per visible row+ // it made a big comp's timeline quadratic).+ let mut opts = vec!["No Track Matte".to_string(), "-".to_string()];+ let mut candidates: Vec<&Layer> = vec![];+ if widgets::popup_is_open(ui, pop) {+ for (i, l) in comp.layers.iter().enumerate().filter(|(_, l)| l.id != layer.id && l.source.is_av()) {+ opts.push(format!("{}. {}", i + 1, l.name));+ candidates.push(l);+ }+ opts.push("-".into());+ for k in MatteKind::ALL {+ opts.push(k.label().into());+ }+ }+ let current = layer.track_matte.and_then(|m| opts.iter().position(|o| o == m.kind.label()));+ if let Some(i) = widgets::popup_menu(ui, pop, mr.left_bottom(), &opts, current) {+ let ids: Vec<LayerId> = candidates.iter().map(|l| l.id).collect();- if let Some(a) = opts.get(i).and_then(|o| track_matte_pick(layer, &ids, i, o)) {++ if let Some(a) = opts.get(i).and_then(|o| track_matte_pick(&video_targets(&comp, layer.id, selected), &ids, i, o)) {+ actions.push(a);+ }+ }+ if layer.track_matte.is_some() {+ let kr = Rect::from_center_size(pos2(mr.max.x - 26.0, cy), vec2(10.0, 10.0));+ let _ = kr;+ }+ }++ /// The parent pick whip and dropdown.+ fn layer_parent_cell(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>) {+ let t = g.tl.t;+ let comp = g.tl.comp.clone();+ let cw = &g.tl.cw;+ let actions = &mut g.tl.actions;+ let lp = g.lp.clone();++ let selected = &g.selected;+ let layer = rc.layer;+ let cy = rc.cy;+ pick_whip(+ app,+ ui,+ &lp,+ Rect::from_center_size(pos2(cw.parent + 9.0, cy), vec2(15.0, 15.0)),+ (WHIP_PARENT, layer.id.0, 0),+ WhipText {+ auto: &format!("timeline.layer.{}.pickWhip", layer.id.0),+ label: "Parent pick whip",+ hint: crate::i18n::tr("Parent pick whip: drag onto a layer"),+ },+ );+ let pr_rect = Rect::from_min_size(pos2(cw.parent + 20.0, cy - 9.0), vec2(94.0, 18.0));+ let plabel = layer.parent.and_then(|p| comp.layer(p)).map(|l| format!("{}. {}", comp.index_of(l.id).unwrap_or(0), l.name)).unwrap_or_else(|| "None".into());+ let presp = widgets::dropdown(ui, pr_rect, &plabel, &t, egui::Id::unique(("parent", layer.id.0)));+ app.auto.add(&format!("timeline.layer.{}.parent", layer.id.0), pr_rect, "Parent");+ let pop = egui::Id::unique(("par-pop", layer.id.0));+ if presp.clicked() {+ widgets::open_popup(ui, pop);+ }+ let mut cands: Vec<&Layer> = vec![];+ let mut popts = vec!["None".to_string(), "-".to_string()];+ if widgets::popup_is_open(ui, pop) {+ for (i, l) in comp.layers.iter().enumerate().filter(|(_, l)| l.id != layer.id) {+ popts.push(format!("{}. {}", i + 1, l.name));+ cands.push(l);+ }+ }+ if let Some(i) = widgets::popup_menu(ui, pop, pr_rect.left_bottom(), &popts, None) {- let par = if i == 0 { serde_json::Value::Null } else { json!(cands[i - 2].id.0) };- actions.push(("layer.setParent".into(), json!({"layers": [layer.id.0], "parent": par})));++ let par = cands.get(i.wrapping_sub(2)).map(|l| l.id.0);++ // (The new parent itself, if selected, stays as it is.)++ let layers: Vec<u64> = edited_layers(layer.id, selected).into_iter().filter(|l| Some(*l) != par).collect();++ actions.push(("layer.setParent".into(), json!({"layers": layers, "parent": par})));+ }+ }++ /// Paints the layer bar; returns it and its label colour.+ fn layer_bar_paint(g: &Rw, rc: &RowCtx<'_>) -> (Rect, Color32) {+ let t = g.tl.t;+ let tm = g.tl.tm;+ let gp = g.gp.clone();+ let layer = rc.layer;+ let r = rc.r;+ let is_sel = rc.is_sel;+ let x_in = tm.x(layer.in_point.seconds());+ let x_out = tm.x(layer.out_point.seconds());+ let bar = Rect::from_min_max(pos2(x_in, r.min.y + 1.0), pos2(x_out, r.max.y - 1.0));+ let lc = t.label(layer.label);+ let fill = bar_color(lc, is_sel);+ gp.rect_filled(bar, 0.0, fill);+ if is_sel {+ gp.rect_stroke(bar, 0.0, Stroke::new(1.0, Color32::from_white_alpha(90)), StrokeKind::Inside);+ }+ (bar, lc)+ }++ /// Dragging the source bar outside the in/out span slips the source.+ fn slip_source_handles(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>, ghost: Rect, bar: Rect) {+ let pps = g.tl.pps;+ let fd = g.tl.fd;+ let ctx = g.tl.ctx.clone();+ let actions = &mut g.tl.actions;+ let ui_actions = &mut g.ui_actions;+ let layer = rc.layer;+ // Dragging the source bar outside the in/out span slips the source.+ for (side, gr) in [("l", Rect::from_min_max(ghost.min, pos2(bar.min.x, ghost.max.y))), ("r", Rect::from_min_max(pos2(bar.max.x, ghost.min.y), ghost.max))] {+ if gr.width() < 2.0 {+ continue;+ }+ let gresp =+ ui.interact(gr, egui::Id::unique(("ghost", side, layer.id.0)), Sense::click_and_drag()).on_hover_text(crate::i18n::tr("Drag to slip the source"));+ // Outside the bar it is empty track area: a plain click deselects.+ if gresp.clicked() && !ui.input(|i| i.modifiers.shift || i.modifiers.command) {+ actions.push(("layer.select".into(), json!({"layers": []})));+ }+ app.auto.add(&format!("timeline.layer.{}.source{}", layer.id.0, side), gr, "Slip");+ if gresp.hovered() || gresp.dragged() {+ ctx.set_cursor_icon(egui::CursorIcon::ResizeHorizontal);+ }+ let acc_id = egui::Id::unique(("slip-acc", layer.id.0));+ if gresp.dragged() {+ let mut acc: f32 = ctx.data(|d| d.get_temp(acc_id).unwrap_or(0.0));+ acc += gresp.drag_delta().x;+ let frames = ((acc as f64 / pps) / fd).trunc() as i64;+ if frames != 0 {+ acc -= (frames as f64 * fd * pps) as f32;+ actions.push(("layer.slip".into(), json!({"layers": [layer.id.0], "frames": frames, "merge": format!("slip-{}", layer.id.0)})));+ }+ ctx.data_mut(|d| d.insert_temp(acc_id, acc));+ }+ if gresp.drag_stopped() {+ ctx.data_mut(|d| d.remove::<f32>(acc_id));+ ui_actions.push(UiAct::EndMerge);+ }+ }+ }++ /// The source extent behind the bar (striped past its ends).+ fn layer_source_extent(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>, bar: Rect, lc: Color32) {+ let tm = g.tl.tm;+ let gp = g.gp.clone();+ let layer = rc.layer;+ let r = rc.r;+ if let LayerSource::Footage { .. } | LayerSource::Comp { .. } = layer.source+ && let Some(d) = layer.source.item().and_then(|i| app.session.project.item(i)).and_then(|i| i.duration())+ {+ let xs = tm.x(layer.start_time.seconds());+ let xe = tm.x(layer.comp_time(d).seconds());+ let ghost = Rect::from_min_max(pos2(xs.min(xe), r.min.y + 9.0), pos2(xs.max(xe), r.max.y - 9.0));+ gp.rect_filled(ghost, 1.0, lc.gamma_multiply(0.18));+ // The bar past the source's end (its last frame held) or before its start+ // is striped, so the source's own span shows (#290). Time remapping+ // decides what shows there itself.+ if layer.props.get("timeRemap").is_none() {+ for (side, part) in [+ ("beforeSource", Rect::from_min_max(bar.min, pos2(ghost.min.x, bar.max.y))),+ ("afterSource", Rect::from_min_max(pos2(ghost.max.x, bar.min.y), bar.max)),+ ] {+ if part.width() >= 1.0 {+ stripes(&gp, part, lc);+ app.auto.add(&format!("timeline.layer.{}.bar.{side}", layer.id.0), part, "Past the source");}}- RowKind::Group { uid, name, open, has_children, fx, eye } => {- // The row draws an effect's name in the interface language (#821); `name` stays- // the property tree's, which the automation labels below keep. Any other group- // (a mask, a shape group, a layer style) draws its own name.- let group = layer.props.find_group(*uid);- let shown = match group.and_then(|g| match &g.kind {- GroupKind::Effect { effect } => Some(effect.as_str()),- _ => None,- }) {- Some(effect) => crate::i18n::effects::group(effect, name),- None => name.clone(),+ }+ slip_source_handles(app, ui, g, rc, ghost, bar);+ }+ }++ /// The bar's move body and trim edges, click selection.+ fn layer_bar_hits(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>, bar: Rect) -> BarResps {+ let cid = g.tl.cid;+ let ctx = g.tl.ctx.clone();+ let comp = g.tl.comp.clone();+ let rows = &g.tl.rows;+ let actions = &mut g.tl.actions;+ let selected = &g.selected;+ let layer = rc.layer;+ let is_sel = rc.is_sel;+ app.auto.add(&format!("timeline.layer.{}.bar", layer.id.0), bar, &layer.name);+ // Interactions: move body, trim edges.+ let (body_r, in_r, out_r) = trim_zones(bar);+ let body = ui.interact(body_r, egui::Id::unique(("bar", layer.id.0)), Sense::click_and_drag());+ let lin = ui.interact(in_r, egui::Id::unique(("bar-in", layer.id.0)), Sense::drag());+ let lout = ui.interact(out_r, egui::Id::unique(("bar-out", layer.id.0)), Sense::drag());+ app.auto.add(&format!("timeline.layer.{}.bar.in", layer.id.0), in_r, "Trim In");+ app.auto.add(&format!("timeline.layer.{}.bar.out", layer.id.0), out_r, "Trim Out");+ if lin.hovered() || lout.hovered() || lin.dragged() || lout.dragged() {+ trim_cursor(&ctx);+ }+ if body.double_clicked()+ && let Some(a) = double_click_action(layer)+ {+ actions.push(a);+ }+ let shift = ui.input(|i| i.modifiers.shift);+ if let Some(layers) = (body.clicked() && shift).then(|| shift_range(&ctx, cid, &comp, rows, selected, layer.id)).flatten() {+ // Shift-click: the layers from the last one clicked to this one, as in+ // the layer outline.+ actions.push(("layer.select".into(), json!({"layers": layers})));+ } else {+ if (body.clicked() || body.drag_started()) && !is_sel {+ actions.push(("layer.select".into(), json!({"layers": [layer.id.0], "add": shift})));+ }+ if (body.clicked() || body.drag_started()) && !shift {+ set_anchor(&ctx, cid, layer.id);+ }+ }+ layer_context_menu(&body, &comp, layer, selected, LayerMenuCaps::of(&app.session.project, layer), &mut app.auto, &mut *actions);+ BarResps { body, lin, lout }+ }++ fn layer_quick_offset_begin(ui: &mut egui::Ui, g: &Rw, rc: &RowCtx<'_>, body: &egui::Response) -> bool {+ let ctx = g.tl.ctx.clone();+ let comp = g.tl.comp.clone();+ let selected = &g.selected;+ let layer = rc.layer;+ let is_sel = rc.is_sel;+ let mods = ui.input(|i| i.modifiers);+ if body.drag_started()+ && is_sel+ && mods.command+ && mods.alt+ && let Some(n) = quick_offset_layers(&comp, selected.iter().copied())+ && let Some(p) = ctx.input(|i| i.pointer.press_origin())+ {+ ctx.data_mut(|d| d.insert_temp(quick_bar_id(), QuickBar { layer: layer.id, origin_x: p.x, layers: n, applied: 0 }));+ }+ ctx.data(|d| d.get_temp::<QuickBar>(quick_bar_id())).is_some_and(|q| q.layer == layer.id)+ }++ /// Moving and trimming a layer bar by whole frames.+ fn layer_bar_drag(g: &mut Rw, rc: &RowCtx<'_>, bars: &BarResps, quick: bool) {+ let BarResps { body, lin, lout } = bars;+ let pps = g.tl.pps;+ let fd = g.tl.fd;+ let ctx = g.tl.ctx.clone();+ let actions = &mut g.tl.actions;+ let selected = &g.selected;+ let ui_actions = &mut g.ui_actions;+ let layer = rc.layer;- let is_sel = rc.is_sel;+ let drag_key = format!("bar-{}", layer.id.0);+ for (resp, kind) in [(&body, "move"), (&lin, "in"), (&lout, "out")] {+ if kind == "move" && quick {+ continue;+ }+ if resp.dragged() {+ let acc_id = egui::Id::unique(("bar-acc", layer.id.0, kind));+ let mut acc: f32 = ctx.data(|d| d.get_temp(acc_id).unwrap_or(0.0));+ acc += resp.drag_delta().x;+ let frames = ((acc as f64 / pps) / fd).trunc() as i64;+ if frames != 0 {+ acc -= (frames as f64 * fd * pps) as f32;+ let d = frames as f64 * fd;+ // Moving or trimming a selected layer acts on the whole+ // selection; each layer trims from its own in/out point.- let targets = if is_sel { json!(selected.iter().map(|l| l.0).collect::<Vec<_>>()) } else { json!([layer.id.0]) };++ let targets = json!(edited_layers(layer.id, selected));+ let params = match kind {+ "move" => json!({"layers": targets, "delta": d, "merge": drag_key}),+ "in" => json!({"layers": targets, "inDelta": d, "merge": drag_key}),+ _ => json!({"layers": targets, "outDelta": d, "merge": drag_key}),};- // Selected groups (an effect, a mask, a shape group…) highlight like selected- // property rows.- let sel_group = app.session.state.selected_props.contains(&(layer.id, *uid));- lp.rect_filled(- left,- 0.0,- if sel_group {- t.row_selected- } else if ri % 2 == 0 {- t.row- } else {- t.row_alt- },- );- gp.rect_filled(Rect::from_min_max(pos2(graph_x0, r.min.y), r.max), 0.0, t.tl_bg);- // An effect's colour label (26.5): the same bar the Effect Controls header wears,- // on the row's left edge.- if let Some(lab) =- group.filter(|g| matches!(g.kind, GroupKind::Effect { .. })).and_then(|g| g.label).filter(|l| *l != effectcraft_engine::color::Label::None)- {- let [lr, lg, lb] = app.session.prefs.label_rgb(lab);- let bar = Rect::from_min_size(left.min, vec2(4.0, left.height()));- lp.rect_filled(bar, 0.0, Color32::from_rgb(lr, lg, lb));- app.auto.add(&format!("timeline.group.{uid}.label"), bar, &app.session.prefs.label_name(lab));- }- let indent = cw.name + 6.0 + 14.0 * row.depth as f32;- if *has_children {- let tw = Rect::from_center_size(pos2(indent, cy), vec2(13.0, 13.0));- if widgets::twirl(ui, tw, *open, egui::Id::unique(("gtw", uid)), &t).clicked() {- // Alt/Cmd-click twirls the whole tree under the group (as on a layer).- ui_actions.push(UiAct::ToggleGroup(layer.id.0, *uid, ui.input(|i| i.modifiers.alt || i.modifiers.command)));- }- app.auto.add(&format!("timeline.group.{uid}.twirl"), tw, name);- }- if let Some(en) = fx {- let fr_ = Rect::from_center_size(pos2(cw.switches + SW * 3.0 + SW / 2.0, cy), vec2(16.0, 16.0));- if widgets::icon_toggle(ui, fr_, Icon::Fx, *en, &t, egui::Id::unique(("gfx", uid)), Sense::click()).clicked() {- actions.push(("effect.toggle".into(), json!({"layer": layer.id.0, "effect": uid})));- }- app.auto.add(&format!("timeline.group.{uid}.fx"), fr_, name);- }- if let Some(en) = eye {- // Layer style eye switch in the A/V column, like AE.- let er = Rect::from_center_size(pos2(cw.av + 10.0, cy), vec2(15.0, 15.0));- lp.rect_stroke(er.shrink(1.5), 2.0, Stroke::new(1.0, t.separator), StrokeKind::Inside);- if widgets::icon_toggle(ui, er, Icon::Eye, *en, &t, egui::Id::unique(("geye", uid)), Sense::click()).clicked() {- actions.push(("layer.style.toggle".into(), json!({"layer": layer.id.0, "style": uid})));- }- app.auto.add(&format!("timeline.group.{uid}.eye"), er, name);- }- let group_edit: Option<(u64, u64, String)> = ctx.data(|d| d.get_temp(group_rename_id()));- if let Some((_, _, mut buf)) = group_edit.filter(|(rl, ru, _)| *rl == layer.id.0 && ru == uid) {- let field = Rect::from_min_max(pos2(indent + 8.0, r.min.y + 2.0), pos2((cw.switches - 4.0).max(indent + 60.0), r.max.y - 2.0));- let mut child = ui.new_child(egui::UiBuilder::new().max_rect(field));- let er = child.add(egui::TextEdit::singleline(&mut buf).font(Tokens::ui(12.0)).desired_width(field.width()));- app.auto.add(&format!("timeline.group.{uid}.nameEdit"), er.rect, &buf);- if ctx.data_mut(|d| d.remove_temp::<bool>(rename_focus_id())).unwrap_or(false) {- er.request_focus();- widgets::select_all(&ctx, er.id, &buf);- }- if er.lost_focus() {- if !ui.input(|i| i.key_pressed(egui::Key::Escape)) && !buf.trim().is_empty() && buf != *name {- actions.push(("prop.renameGroup".into(), json!({"layer": layer.id.0, "prop": uid, "name": buf})));- }- ctx.data_mut(|d| d.remove::<(u64, u64, String)>(group_rename_id()));- } else {- ctx.data_mut(|d| d.insert_temp(group_rename_id(), (layer.id.0, *uid, buf)));- }- } else {- lp.text(pos2(indent + 10.0, cy), Align2::LEFT_CENTER, &shown, Tokens::ui(12.0), t.text);- }- text_anim_popups(app, ui, &lp, layer, *uid, cw.switches, cy, &mut actions);- shape_add_popup(app, ui, &lp, layer, *uid, cw.switches, cy, &mut actions);- if *uid == GEOM_BIT | layer.id.0 {- let lr = lp.text(pos2(cw.switches + 6.0, cy), Align2::LEFT_CENTER, crate::i18n::tr("Change Renderer…"), Tokens::ui(11.5), t.accent);- let resp = ui- .interact(lr, egui::Id::unique(("tl-change-renderer", layer.id.0)), Sense::click())- .on_hover_text(crate::i18n::tr("Composition Settings ▸ 3D Renderer"));- if resp.hovered() {- ctx.set_cursor_icon(egui::CursorIcon::PointingHand);- }- app.auto.add(&format!("timeline.layer.{}.changeRenderer", layer.id.0), lr, "Change Renderer…");- if resp.clicked() {- ui_actions.push(UiAct::ChangeRenderer);- }- }- dash_buttons(app, ui, &lp, layer, *uid, cw.switches, cy, &mut actions);- // Mask mode + inverted inline.- if let Some(g) = layer.props.find_group(*uid)- && let GroupKind::Mask { mode, inverted, .. } = g.kind- {- let mr = Rect::from_min_size(pos2(cw.switches + 4.0, cy - 9.0), vec2(80.0, 18.0));- let pop = egui::Id::unique(("maskmode", uid));- if widgets::dropdown(ui, mr, mode.label(), &t, egui::Id::unique(("mm", uid))).clicked() {- widgets::open_popup(ui, pop);- }- let opts: Vec<String> = effectcraft_engine::project::MaskMode::ALL.iter().map(|m| m.label().to_string()).collect();- if let Some(i) = widgets::popup_menu(ui, pop, mr.left_bottom(), &opts, None) {- actions.push(("layer.setMask".into(), json!({"layer": layer.id.0, "mask": uid, "mode": opts[i]})));- }- let ir = Rect::from_min_size(pos2(mr.max.x + 8.0, cy - 8.0), vec2(16.0, 16.0));- if widgets::checkbox(ui, ir, inverted, &t, egui::Id::unique(("minv", uid))).clicked() {- actions.push(("layer.setMask".into(), json!({"layer": layer.id.0, "mask": uid, "inverted": !inverted})));- }- lp.text(pos2(ir.max.x + 4.0, cy), Align2::LEFT_CENTER, crate::i18n::tr("Inverted"), Tokens::ui(11.0), t.text_dim);- }- let gr_rect = Rect::from_min_max(pos2(indent + 8.0, r.min.y), pos2(cw.switches, r.max.y));- let gr = ui.interact(gr_rect, egui::Id::unique(("grow", uid)), Sense::click());- app.auto.add(&format!("timeline.group.{uid}.name"), gr_rect, name);- if gr.clicked() && uid & (WAVE_BIT | GEOM_BIT) == 0 {- actions.push(("prop.select".into(), json!({"layer": layer.id.0, "prop": uid, "selectKeys": false})));- }- if gr.double_clicked() {- if fx.is_some() {- // An effect's name: open it in Effect Controls (as in After Effects).- actions.push(("layer.select".into(), json!({"layers": [layer.id.0]})));- actions.push(("prop.select".into(), json!({"layer": layer.id.0, "prop": uid, "selectKeys": false})));- actions.push(("window.panel".into(), json!({"panel": "EffectControls"})));- } else {- ui_actions.push(UiAct::ToggleGroup(layer.id.0, *uid, false));- }- }+ actions.push(("layer.timing".into(), params));}- RowKind::Waveform { item } => {- lp.rect_filled(left, 0.0, if ri % 2 == 0 { t.row } else { t.row_alt });- let indent = cw.name + 6.0 + 14.0 * row.depth as f32;- lp.text(pos2(indent + 10.0, cy), Align2::LEFT_CENTER, "Waveform", Tokens::ui(12.0), t.text);- let wr = Rect::from_min_max(pos2(graph_x0, r.min.y), r.max);- gp.rect_filled(wr, 0.0, t.tl_bg);- app.auto.add(&format!("timeline.layer.{}.waveform", layer.id.0), wr, "Waveform");- match super::waveform::summary(app, &ctx, ItemId(*item)) {- Some(s) => super::waveform::draw(&gp, wr.shrink2(vec2(0.0, 2.0)), &tm, layer, &s, Color32::from_rgb(0x5f, 0xc8, 0x8a)),- None => {- gp.text(- pos2(tm.x(layer.in_point.seconds()).max(wr.min.x) + 6.0, wr.center().y),- Align2::LEFT_CENTER,- "Building waveform…",- Tokens::ui(11.0),- t.text_faint,- );- }- }+ ctx.data_mut(|d| d.insert_temp(acc_id, acc));+ }+ if resp.drag_stopped() {+ ctx.data_mut(|d| d.remove::<f32>(egui::Id::unique(("bar-acc", layer.id.0, kind))));+ ui_actions.push(UiAct::EndMerge);+ }+ }+ }++ fn layer_bar_markers(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &Rw, rc: &RowCtx<'_>) {+ let graph_x0 = g.tl.graph_x0;+ let tm = g.tl.tm;+ let rows_rect = g.tl.rows_rect;+ let comp = g.tl.comp.clone();+ let layer = rc.layer;+ let r = rc.r;+ let gclip = rows_rect.intersect(Rect::from_min_max(pos2(graph_x0, rows_rect.min.y), rows_rect.max));+ super::markers_ui::layer_markers(app, ui, gclip, &comp, layer, tm, r);+ }++ /// The group row's background and effect label bar; returns the name to draw.+ fn group_background(app: &mut EffectcraftApp, g: &Rw, rc: &RowCtx<'_>) -> String {+ let t = g.tl.t;+ let graph_x0 = g.tl.graph_x0;+ let lp = g.lp.clone();+ let gp = g.gp.clone();+ let layer = rc.layer;+ let r = rc.r;+ let left = rc.left;+ let ri = rc.ri;+ let RowKind::Group { uid, name, .. } = &rc.row.kind else { return String::new() };+ let group = layer.props.find_group(*uid);+ let shown = match group.and_then(|g| match &g.kind {+ GroupKind::Effect { effect } => Some(effect.as_str()),+ _ => None,+ }) {+ Some(effect) => crate::i18n::effects::group(effect, name),+ None => name.clone(),+ };+ // Selected groups (an effect, a mask, a shape group…) highlight like selected+ // property rows.+ let sel_group = app.session.state.selected_props.contains(&(layer.id, *uid));+ lp.rect_filled(+ left,+ 0.0,+ if sel_group {+ t.row_selected+ } else if ri.is_multiple_of(2) {+ t.row+ } else {+ t.row_alt+ },+ );+ gp.rect_filled(Rect::from_min_max(pos2(graph_x0, r.min.y), r.max), 0.0, t.tl_bg);+ // An effect's colour label (26.5): the same bar the Effect Controls header wears,+ // on the row's left edge.+ if let Some(lab) =+ group.filter(|g| matches!(g.kind, GroupKind::Effect { .. })).and_then(|g| g.label).filter(|l| *l != effectcraft_engine::color::Label::None)+ {+ let [lr, lg, lb] = app.session.prefs.label_rgb(lab);+ let bar = Rect::from_min_size(left.min, vec2(4.0, left.height()));+ lp.rect_filled(bar, 0.0, Color32::from_rgb(lr, lg, lb));+ app.auto.add(&format!("timeline.group.{uid}.label"), bar, &app.session.prefs.label_name(lab));+ }+ shown+ }++ /// The group's twirl, effect switch and style eye.+ fn group_switches(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>) {+ let t = g.tl.t;+ let cw = &g.tl.cw;+ let actions = &mut g.tl.actions;+ let lp = g.lp.clone();+ let ui_actions = &mut g.ui_actions;+ let layer = rc.layer;+ let cy = rc.cy;+ let indent = rc.indent;+ let RowKind::Group { uid, name, open, has_children, fx, eye, .. } = &rc.row.kind else { return };+ if *has_children {+ let tw = Rect::from_center_size(pos2(indent, cy), vec2(13.0, 13.0));+ if widgets::twirl(ui, tw, *open, egui::Id::unique(("gtw", uid)), &t).clicked() {+ // Alt/Cmd-click twirls the whole tree under the group (as on a layer).+ ui_actions.push(UiAct::ToggleGroup(layer.id.0, *uid, ui.input(|i| i.modifiers.alt || i.modifiers.command)));+ }+ app.auto.add(&format!("timeline.group.{uid}.twirl"), tw, name);+ }+ if let Some(en) = fx {+ let fr_ = Rect::from_center_size(pos2(cw.switches + SW * 3.0 + SW / 2.0, cy), vec2(16.0, 16.0));+ if widgets::icon_toggle(ui, fr_, Icon::Fx, *en, &t, egui::Id::unique(("gfx", uid)), Sense::click()).clicked() {+ actions.push(("effect.toggle".into(), json!({"layer": layer.id.0, "effect": uid})));+ }+ app.auto.add(&format!("timeline.group.{uid}.fx"), fr_, name);+ }+ if let Some(en) = eye {+ // Layer style eye switch in the A/V column, like AE.+ let er = Rect::from_center_size(pos2(cw.av + 10.0, cy), vec2(15.0, 15.0));+ lp.rect_stroke(er.shrink(1.5), 2.0, Stroke::new(1.0, t.separator), StrokeKind::Inside);+ if widgets::icon_toggle(ui, er, Icon::Eye, *en, &t, egui::Id::unique(("geye", uid)), Sense::click()).clicked() {+ actions.push(("layer.style.toggle".into(), json!({"layer": layer.id.0, "style": uid})));+ }+ app.auto.add(&format!("timeline.group.{uid}.eye"), er, name);+ }+ }++ /// The group name, or its rename field.+ fn group_name(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>, shown: &str) {+ let t = g.tl.t;+ let ctx = g.tl.ctx.clone();+ let cw = &g.tl.cw;+ let actions = &mut g.tl.actions;+ let lp = g.lp.clone();+ let layer = rc.layer;+ let r = rc.r;+ let cy = rc.cy;+ let indent = rc.indent;+ let RowKind::Group { uid, name, .. } = &rc.row.kind else { return };+ let group_edit: Option<(u64, u64, String)> = ctx.data(|d| d.get_temp(group_rename_id()));+ if let Some((_, _, mut buf)) = group_edit.filter(|(rl, ru, _)| *rl == layer.id.0 && ru == uid) {+ let field = Rect::from_min_max(pos2(indent + 8.0, r.min.y + 2.0), pos2((cw.switches - 4.0).max(indent + 60.0), r.max.y - 2.0));+ let mut child = ui.new_child(egui::UiBuilder::new().max_rect(field));+ let er = child.add(egui::TextEdit::singleline(&mut buf).font(Tokens::ui(12.0)).desired_width(field.width()));+ app.auto.add(&format!("timeline.group.{uid}.nameEdit"), er.rect, &buf);+ if ctx.data_mut(|d| d.remove_temp::<bool>(rename_focus_id())).unwrap_or(false) {+ er.request_focus();+ widgets::select_all(&ctx, er.id, &buf);+ }+ if er.lost_focus() {+ if !ui.input(|i| i.key_pressed(egui::Key::Escape)) && !buf.trim().is_empty() && buf != *name {+ actions.push(("prop.renameGroup".into(), json!({"layer": layer.id.0, "prop": uid, "name": buf})));}- RowKind::Expr { uid, lines } => {- let Some(prop) = layer.props.find(*uid) else { continue };- let Some(ex) = prop.expr.clone() else { continue };- let (buf_id, edit_id) = (expr_buf_id(*uid), egui::Id::unique(("expr-edit", uid)));- // The same background as its property's row, selection included.- let sel_prop = app.session.state.selected_props.contains(&(layer.id, *uid));- lp.rect_filled(- left,- 0.0,- if sel_prop {- t.row_selected- } else if ri % 2 == 0 {- t.row- } else {- t.row_alt- },- );- let indent = cw.name + 6.0 + 14.0 * row.depth as f32;- lp.text(pos2(indent + 12.0, cy), Align2::LEFT_CENTER, crate::i18n::tr("Expression:"), Tokens::ui(11.5), t.text_dim);- lp.text(pos2(indent + 82.0, cy), Align2::LEFT_CENTER, &prop.name, Tokens::ui(11.5), t.text);- // "=" enable switch and the property pick whip (AE's expression controls).- let en_r = Rect::from_center_size(pos2(cw.switches + 10.0, cy), vec2(16.0, 16.0));- let en = ui.interact(en_r, egui::Id::unique(("expr-en", uid)), Sense::click()).on_hover_text(crate::i18n::tr("Enable Expression"));- lp.rect_stroke(en_r.shrink(1.0), 2.0, Stroke::new(1.0, t.separator), StrokeKind::Inside);- let expr_col = t.expr_text;- lp.text(- en_r.center(),- Align2::CENTER_CENTER,- if ex.enabled { "=" } else { "≠" },- Tokens::semibold(13.0),- if ex.enabled { expr_col } else { t.text_dim },- );- app.auto.add(&format!("timeline.prop.{uid}.exprEnable"), en_r, "Enable Expression");- if en.clicked() {- actions.push(("prop.setExpression".into(), json!({"layer": layer.id.0, "prop": uid, "enabled": !ex.enabled})));- }- let pw = pick_whip(- app,- ui,- &lp,- Rect::from_center_size(pos2(cw.switches + 30.0, cy), vec2(15.0, 15.0)),- (WHIP_EXPR, layer.id.0, *uid),- &format!("timeline.prop.{uid}.pickWhip"),- "Expression pick whip",- crate::i18n::tr("Expression pick whip: drag onto a property"),- );- if pw.is_pointer_button_down_on() && ui.input(|i| i.pointer.primary_pressed()) {- // Pressed while the expression is being edited (its text is buffered while- // the editor has the focus): the reference will go in at the cursor,- // replacing the selection (#284).- let into = ctx.data(|d| d.get_temp::<String>(buf_id)).map(|buf| {- let n = buf.chars().count();- let sel = egui::text_edit::TextEditState::load(&ctx, edit_id)- .and_then(|st| st.cursor.char_range())- .map_or([n, n], |r| [r.primary.index.0.min(r.secondary.index.0).min(n), r.primary.index.0.max(r.secondary.index.0).min(n)]);- (buf, sel)- });- ctx.data_mut(|d| {- if let Some(into) = into {- d.insert_temp(whip_into_id(*uid), into);- } else {- d.remove::<WhipInto>(whip_into_id(*uid));+ ctx.data_mut(|d| d.remove::<(u64, u64, String)>(group_rename_id()));+ } else {+ ctx.data_mut(|d| d.insert_temp(group_rename_id(), (layer.id.0, *uid, buf)));+ }+ } else {+ lp.text(pos2(indent + 10.0, cy), Align2::LEFT_CENTER, shown, Tokens::ui(12.0), t.text);+ }+ }++ /// Add / animate popups, Change Renderer and dash buttons.+ fn group_popups(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>) {+ let t = g.tl.t;+ let ctx = g.tl.ctx.clone();+ let cw = &g.tl.cw;+ let actions = &mut g.tl.actions;+ let lp = g.lp.clone();+ let ui_actions = &mut g.ui_actions;+ let layer = rc.layer;+ let cy = rc.cy;+ let RowKind::Group { uid, .. } = &rc.row.kind else { return };+ text_anim_popups(app, ui, &lp, layer, *uid, pos2(cw.switches, cy), &mut *actions);+ shape_add_popup(app, ui, &lp, layer, *uid, pos2(cw.switches, cy), &mut *actions);+ if *uid == GEOM_BIT | layer.id.0 {+ let lr = lp.text(pos2(cw.switches + 6.0, cy), Align2::LEFT_CENTER, crate::i18n::tr("Change Renderer…"), Tokens::ui(11.5), t.accent);+ let resp = ui+ .interact(lr, egui::Id::unique(("tl-change-renderer", layer.id.0)), Sense::click())+ .on_hover_text(crate::i18n::tr("Composition Settings ▸ 3D Renderer"));+ if resp.hovered() {+ ctx.set_cursor_icon(egui::CursorIcon::PointingHand);+ }+ app.auto.add(&format!("timeline.layer.{}.changeRenderer", layer.id.0), lr, "Change Renderer…");+ if resp.clicked() {+ ui_actions.push(UiAct::ChangeRenderer);+ }+ }+ dash_buttons(app, ui, &lp, layer, *uid, pos2(cw.switches, cy), &mut *actions);+ }++ /// Mask mode and inverted, inline.+ fn group_mask_mode(ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>) {+ let t = g.tl.t;+ let cw = &g.tl.cw;+ let actions = &mut g.tl.actions;+ let lp = g.lp.clone();+ let layer = rc.layer;+ let cy = rc.cy;+ let RowKind::Group { uid, .. } = &rc.row.kind else { return };+ // Mask mode + inverted inline.+ if let Some(g) = layer.props.find_group(*uid)+ && let GroupKind::Mask { mode, inverted, .. } = g.kind+ {+ let mr = Rect::from_min_size(pos2(cw.switches + 4.0, cy - 9.0), vec2(80.0, 18.0));+ let pop = egui::Id::unique(("maskmode", uid));+ if widgets::dropdown(ui, mr, mode.label(), &t, egui::Id::unique(("mm", uid))).clicked() {+ widgets::open_popup(ui, pop);+ }+ let opts: Vec<String> = effectcraft_engine::project::MaskMode::ALL.iter().map(|m| m.label().to_string()).collect();+ if let Some(i) = widgets::popup_menu(ui, pop, mr.left_bottom(), &opts, None) {+ actions.push(("layer.setMask".into(), json!({"layer": layer.id.0, "mask": uid, "mode": opts[i]})));+ }+ let ir = Rect::from_min_size(pos2(mr.max.x + 8.0, cy - 8.0), vec2(16.0, 16.0));+ if widgets::checkbox(ui, ir, inverted, &t, egui::Id::unique(("minv", uid))).clicked() {+ actions.push(("layer.setMask".into(), json!({"layer": layer.id.0, "mask": uid, "inverted": !inverted})));+ }+ lp.text(pos2(ir.max.x + 4.0, cy), Align2::LEFT_CENTER, crate::i18n::tr("Inverted"), Tokens::ui(11.0), t.text_dim);+ }+ }++ /// Group row click and double-click.+ fn group_row_click(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>) {+ let cw = &g.tl.cw;+ let actions = &mut g.tl.actions;+ let ui_actions = &mut g.ui_actions;+ let layer = rc.layer;+ let r = rc.r;+ let indent = rc.indent;+ let RowKind::Group { uid, name, fx, .. } = &rc.row.kind else { return };+ let gr_rect = Rect::from_min_max(pos2(indent + 8.0, r.min.y), pos2(cw.switches, r.max.y));+ let gr = ui.interact(gr_rect, egui::Id::unique(("grow", uid)), Sense::click());+ app.auto.add(&format!("timeline.group.{uid}.name"), gr_rect, name);+ if gr.clicked() && uid & (WAVE_BIT | GEOM_BIT) == 0 {+ actions.push(("prop.select".into(), json!({"layer": layer.id.0, "prop": uid, "selectKeys": false})));+ }+ if gr.double_clicked() {+ if fx.is_some() {+ // An effect's name: open it in Effect Controls (as in After Effects).+ actions.push(("layer.select".into(), json!({"layers": [layer.id.0]})));+ actions.push(("prop.select".into(), json!({"layer": layer.id.0, "prop": uid, "selectKeys": false})));+ actions.push(("window.panel".into(), json!({"panel": "EffectControls"})));+ } else {+ ui_actions.push(UiAct::ToggleGroup(layer.id.0, *uid, false));+ }+ }+ }++ fn waveform_row(app: &mut EffectcraftApp, g: &Rw, rc: &RowCtx<'_>) {+ let t = g.tl.t;+ let graph_x0 = g.tl.graph_x0;+ let tm = g.tl.tm;+ let ctx = g.tl.ctx.clone();+ let cw = &g.tl.cw;+ let lp = g.lp.clone();+ let gp = g.gp.clone();+ let row = rc.row;+ let layer = rc.layer;+ let r = rc.r;+ let left = rc.left;+ let cy = rc.cy;+ let ri = rc.ri;+ let RowKind::Waveform { item, .. } = &rc.row.kind else { return };+ lp.rect_filled(left, 0.0, if ri.is_multiple_of(2) { t.row } else { t.row_alt });+ let indent = cw.name + 6.0 + 14.0 * row.depth as f32;+ lp.text(pos2(indent + 10.0, cy), Align2::LEFT_CENTER, "Waveform", Tokens::ui(12.0), t.text);+ let wr = Rect::from_min_max(pos2(graph_x0, r.min.y), r.max);+ gp.rect_filled(wr, 0.0, t.tl_bg);+ app.auto.add(&format!("timeline.layer.{}.waveform", layer.id.0), wr, "Waveform");+ match super::waveform::summary(app, &ctx, ItemId(*item)) {+ Some(s) => super::waveform::draw(&gp, wr.shrink2(vec2(0.0, 2.0)), &tm, layer, &s, Color32::from_rgb(0x5f, 0xc8, 0x8a)),+ None => {+ gp.text(+ pos2(tm.x(layer.in_point.seconds()).max(wr.min.x) + 6.0, wr.center().y),+ Align2::LEFT_CENTER,+ "Building waveform…",+ Tokens::ui(11.0),+ t.text_faint,+ );+ }+ }+ }++ /// The expression row's outline side: enable, pick whip and syntax warning.+ fn expr_controls(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>, st: &ExprRow<'_>) {+ let ExprRow { prop, ex, buf_id, edit_id, .. } = *st;+ let t = g.tl.t;+ let ctx = g.tl.ctx.clone();+ let cw = &g.tl.cw;+ let actions = &mut g.tl.actions;+ let lp = g.lp.clone();+ let row = rc.row;+ let layer = rc.layer;+ let left = rc.left;+ let cy = rc.cy;+ let ri = rc.ri;+ let RowKind::Expr { uid, .. } = &rc.row.kind else { return };+ let sel_prop = app.session.state.selected_props.contains(&(layer.id, *uid));+ lp.rect_filled(+ left,+ 0.0,+ if sel_prop {+ t.row_selected+ } else if ri.is_multiple_of(2) {+ t.row+ } else {+ t.row_alt+ },+ );+ let indent = cw.name + 6.0 + 14.0 * row.depth as f32;+ lp.text(pos2(indent + 12.0, cy), Align2::LEFT_CENTER, crate::i18n::tr("Expression:"), Tokens::ui(11.5), t.text_dim);+ lp.text(pos2(indent + 82.0, cy), Align2::LEFT_CENTER, &prop.name, Tokens::ui(11.5), t.text);+ // "=" enable switch and the property pick whip (AE's expression controls).+ let en_r = Rect::from_center_size(pos2(cw.switches + 10.0, cy), vec2(16.0, 16.0));+ let en = ui.interact(en_r, egui::Id::unique(("expr-en", uid)), Sense::click()).on_hover_text(crate::i18n::tr("Enable Expression"));+ lp.rect_stroke(en_r.shrink(1.0), 2.0, Stroke::new(1.0, t.separator), StrokeKind::Inside);+ let expr_col = t.expr_text;+ lp.text(en_r.center(), Align2::CENTER_CENTER, if ex.enabled { "=" } else { "≠" }, Tokens::semibold(13.0), if ex.enabled { expr_col } else { t.text_dim });+ app.auto.add(&format!("timeline.prop.{uid}.exprEnable"), en_r, "Enable Expression");+ if en.clicked() {+ actions.push(("prop.setExpression".into(), json!({"layer": layer.id.0, "prop": uid, "enabled": !ex.enabled})));+ }+ let pw = pick_whip(+ app,+ ui,+ &lp,+ Rect::from_center_size(pos2(cw.switches + 30.0, cy), vec2(15.0, 15.0)),+ (WHIP_EXPR, layer.id.0, *uid),+ WhipText {+ auto: &format!("timeline.prop.{uid}.pickWhip"),+ label: "Expression pick whip",+ hint: crate::i18n::tr("Expression pick whip: drag onto a property"),+ },+ );+ if pw.is_pointer_button_down_on() && ui.input(|i| i.pointer.primary_pressed()) {+ // Pressed while the expression is being edited (its text is buffered while+ // the editor has the focus): the reference will go in at the cursor,+ // replacing the selection (#284).+ let into = ctx.data(|d| d.get_temp::<String>(buf_id)).map(|buf| {+ let n = buf.chars().count();+ let sel = egui::text_edit::TextEditState::load(&ctx, edit_id)+ .and_then(|st| st.cursor.char_range())+ .map_or([n, n], |r| [r.primary.index.0.min(r.secondary.index.0).min(n), r.primary.index.0.max(r.secondary.index.0).min(n)]);+ (buf, sel)+ });+ ctx.data_mut(|d| {+ if let Some(into) = into {+ d.insert_temp(whip_into_id(*uid), into);+ } else {+ d.remove::<WhipInto>(whip_into_id(*uid));+ }+ });+ }+ // Syntax errors: warning in the outline (the expression is disabled).+ if let Some(check) = app.session.expr_check+ && let Err(e) = check(&ex.text)+ {+ let wr = Rect::from_center_size(pos2(cw.switches + 50.0, cy), vec2(14.0, 14.0));+ lp.text(wr.center(), Align2::CENTER_CENTER, "⚠", Tokens::ui(12.0), Color32::from_rgb(0xf0, 0xa0, 0x30));+ let _ = ui.interact(wr, egui::Id::unique(("expr-err", uid)), Sense::hover()).on_hover_text(e);+ }+ }++ /// The Expression Language menu inserts at the cursor.+ fn expr_language_menu(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>, st: &ExprRow<'_>) {+ let ExprRow { ex, buf_id, edit_id, .. } = *st;+ let t = g.tl.t;+ let ctx = g.tl.ctx.clone();+ let cw = &g.tl.cw;+ let actions = &mut g.tl.actions;+ let lp = g.lp.clone();+ let layer = rc.layer;+ let cy = rc.cy;+ let RowKind::Expr { uid, .. } = &rc.row.kind else { return };+ // ⓕ: the Expression Language menu inserts at the cursor.+ let lang_r = Rect::from_center_size(pos2(cw.switches + 70.0, cy), vec2(16.0, 16.0));+ let lang = ui.interact(lang_r, egui::Id::unique(("expr-lang", uid)), Sense::click()).on_hover_text(crate::i18n::tr("Expression Language Menu"));+ lp.circle_stroke(lang_r.center(), 6.5, Stroke::new(1.0, if lang.hovered() { t.text } else { t.text_dim }));+ lp.text(lang_r.center(), Align2::CENTER_CENTER, "f", Tokens::semibold(10.0), if lang.hovered() { t.text } else { t.text_dim });+ app.auto.add(&format!("timeline.prop.{uid}.exprLanguage"), lang_r, "Expression Language Menu");+ let mut picked: Option<&'static str> = None;+ egui::Popup::menu(&lang).style(crate::widgets::menu_style).show(|ui| {+ for (cat, items) in effectcraft_engine::commands::expr_tools::language_menu() {+ ui.menu_button(cat, |ui| {+ widgets::menu_scroll(ui, false, |ui| {+ for (label, text) in items {+ if ui.button(label).clicked() {+ picked = Some(text);+ ui.close();}- });- }- // Syntax errors: warning in the outline (the expression is disabled).- if let Some(check) = app.session.expr_check- && let Err(e) = check(&ex.text)- {- let wr = Rect::from_center_size(pos2(cw.switches + 50.0, cy), vec2(14.0, 14.0));- lp.text(wr.center(), Align2::CENTER_CENTER, "⚠", Tokens::ui(12.0), Color32::from_rgb(0xf0, 0xa0, 0x30));- let _ = ui.interact(wr, egui::Id::unique(("expr-err", uid)), Sense::hover()).on_hover_text(e);- }- // ⓕ: the Expression Language menu inserts at the cursor.- let lang_r = Rect::from_center_size(pos2(cw.switches + 70.0, cy), vec2(16.0, 16.0));- let lang = ui.interact(lang_r, egui::Id::unique(("expr-lang", uid)), Sense::click()).on_hover_text(crate::i18n::tr("Expression Language Menu"));- lp.circle_stroke(lang_r.center(), 6.5, Stroke::new(1.0, if lang.hovered() { t.text } else { t.text_dim }));- lp.text(lang_r.center(), Align2::CENTER_CENTER, "f", Tokens::semibold(10.0), if lang.hovered() { t.text } else { t.text_dim });- app.auto.add(&format!("timeline.prop.{uid}.exprLanguage"), lang_r, "Expression Language Menu");- let mut picked: Option<&'static str> = None;- egui::Popup::menu(&lang).style(crate::widgets::menu_style).show(|ui| {- for (cat, items) in effectcraft_engine::commands::expr_tools::language_menu() {- ui.menu_button(cat, |ui| {- widgets::menu_scroll(ui, false, |ui| {- for (label, text) in items {- if ui.button(label).clicked() {- picked = Some(text);- ui.close();- }- }- })- });}- });- if let Some(text) = picked {- let cur: String = ctx.data(|d| d.get_temp(buf_id)).unwrap_or_else(|| ex.text.clone());- let at = egui::text_edit::TextEditState::load(&ctx, edit_id)- .and_then(|st| st.cursor.char_range())- .map(|r| r.primary.index.0)- .unwrap_or(cur.chars().count())- .min(cur.chars().count());- let byte = cur.char_indices().nth(at).map(|(b, _)| b).unwrap_or(cur.len());- let mut next = cur.clone();- next.insert_str(byte, text);- actions.push(("prop.setExpression".into(), json!({"layer": layer.id.0, "prop": uid, "expression": next})));- ctx.data_mut(|d| d.remove::<String>(buf_id));- }- // The editor in the time-graph area.- ui.set_clip_rect(right_clip);- gp.rect_filled(Rect::from_min_max(pos2(graph_x0, r.min.y), r.max), 0.0, t.expr_bg);- let er = Rect::from_min_max(pos2(graph_x0 + 8.0, r.min.y + 3.0), pos2(rect.max.x - 14.0, r.max.y - 3.0));- let mut buf: String = ctx.data(|d| d.get_temp(buf_id)).unwrap_or_else(|| ex.text.clone());- if let Some(f) = ctx.data(|d| d.get_temp::<ExprFocus>(expr_focus_id())).filter(|f| f.prop == *uid) {- // Asked for once (a pick whip put a reference in, or an Alt-click added the- // expression): editing starts in the expression as it is now.+ })+ });+ }+ });+ if let Some(text) = picked {+ let cur: String = ctx.data(|d| d.get_temp(buf_id)).unwrap_or_else(|| ex.text.clone());+ let at = egui::text_edit::TextEditState::load(&ctx, edit_id)+ .and_then(|st| st.cursor.char_range())+ .map(|r| r.primary.index.0)+ .unwrap_or(cur.chars().count())+ .min(cur.chars().count());+ let byte = cur.char_indices().nth(at).map(|(b, _)| b).unwrap_or(cur.len());+ let mut next = cur.clone();+ next.insert_str(byte, text);+ actions.push(("prop.setExpression".into(), json!({"layer": layer.id.0, "prop": uid, "expression": next})));+ ctx.data_mut(|d| d.remove::<String>(buf_id));+ }+ }++ /// The expression editor in the time-graph area.+ fn expr_editor_cell(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>, st: &ExprRow<'_>) {+ let ExprRow { prop, ex, buf_id, edit_id, .. } = *st;+ let t = g.tl.t;+ let rect = g.tl.rect;+ let graph_x0 = g.tl.graph_x0;+ let rh = g.tl.rh;+ let ctx = g.tl.ctx.clone();+ let actions = &mut g.tl.actions;+ let right_clip = g.right_clip;+ let gp = g.gp.clone();+ let layer = rc.layer;+ let r = rc.r;+ let RowKind::Expr { uid, lines, .. } = &rc.row.kind else { return };+ let expr_col = t.expr_text;+ // The editor in the time-graph area.+ ui.set_clip_rect(right_clip);+ gp.rect_filled(Rect::from_min_max(pos2(graph_x0, r.min.y), r.max), 0.0, t.expr_bg);+ let er = Rect::from_min_max(pos2(graph_x0 + 8.0, r.min.y + 3.0), pos2(rect.max.x - 14.0, r.max.y - 3.0));+ let mut buf: String = ctx.data(|d| d.get_temp(buf_id)).unwrap_or_else(|| ex.text.clone());+ if let Some(f) = ctx.data(|d| d.get_temp::<ExprFocus>(expr_focus_id())).filter(|f| f.prop == *uid) {+ // Asked for once (a pick whip put a reference in, or an Alt-click added the+ // expression): editing starts in the expression as it is now.+ ctx.data_mut(|d| d.remove::<ExprFocus>(expr_focus_id()));+ buf = ex.text.clone();+ let n = buf.chars().count();+ let [a, b] = f.select.map(|before_end| egui::text::CCursor::new(n.saturating_sub(before_end)));+ let mut st = egui::text_edit::TextEditState::load(&ctx, edit_id).unwrap_or_default();+ st.cursor.set_char_range(Some(egui::text::CCursorRange::two(a, b)));+ st.store(&ctx, edit_id);+ ctx.memory_mut(|m| m.request_focus(edit_id));+ }+ // Settings ▸ Scripting & Expressions ▸ Expressions Editor.+ let sp = app.session.prefs.scripting.clone();+ let resp = super::expr_editor::editor(+ ui,+ edit_id,+ &mut buf,+ er,+ super::expr_editor::EditorOpts { prefs: &sp, color: if ex.enabled { expr_col } else { t.text_dim }, rows: *lines },+ &t,+ );+ app.auto.add(&format!("timeline.prop.{uid}.expression"), er, &prop.name);+ // Its bottom edge drags to set its height in whole lines, as in After Effects.+ let edge = Rect::from_min_max(pos2(er.min.x, r.max.y - 4.0), pos2(er.max.x, r.max.y));+ let eresp = ui.interact(edge, egui::Id::unique(("expr-edge", uid)), Sense::drag());+ app.auto.add(&format!("timeline.prop.{uid}.expressionHeight"), edge, "Expression field height");+ if eresp.hovered() || eresp.dragged() {+ ctx.set_cursor_icon(egui::CursorIcon::ResizeVertical);+ }+ if let Some(py) = eresp.interact_pointer_pos().filter(|_| eresp.dragged()).map(|p| p.y) {+ let n = ((py - r.min.y) / rh).round().clamp(1.0, EXPR_MAX_LINES as f32);+ app.ui.timeline.expr_lines.insert(*uid, n as usize);+ }+ let commit = resp.has_focus() && ui.input(|i| i.key_pressed(egui::Key::Enter) && (i.modifiers.command || i.modifiers.ctrl));+ if commit {+ resp.surrender_focus();+ }+ if resp.has_focus() && !commit {+ ctx.data_mut(|d| d.insert_temp(buf_id, buf));+ } else {+ if (resp.lost_focus() || commit) && buf.trim_end() != ex.text {+ actions.push(("prop.setExpression".into(), json!({"layer": layer.id.0, "prop": uid, "expression": buf.trim_end()})));+ }+ ctx.data_mut(|d| d.remove::<String>(buf_id));+ }+ }++ fn prop_background(app: &mut EffectcraftApp, g: &Rw, rc: &RowCtx<'_>, prop: &Property) {+ let t = g.tl.t;+ let graph_x0 = g.tl.graph_x0;+ let lp = g.lp.clone();+ let gp = g.gp.clone();+ let layer = rc.layer;+ let r = rc.r;+ let left = rc.left;+ let ri = rc.ri;+ let uid = &prop.uid;++ app.auto.add(&format!("timeline.prop.{uid}.row"), r, &prop.name);+ let sel_prop = app.session.state.selected_props.contains(&(layer.id, *uid));+ lp.rect_filled(+ left,+ 0.0,+ if sel_prop {+ t.row_selected+ } else if ri.is_multiple_of(2) {+ t.row+ } else {+ t.row_alt+ },+ );+ gp.rect_filled(Rect::from_min_max(pos2(graph_x0, r.min.y), r.max), 0.0, t.tl_bg);+ }++ /// The keyframe navigator (previous, toggle, next).+ fn prop_key_navigator(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>, prop: &Property) {+ let t = g.tl.t;+ let time = g.tl.time;+ let fr = g.tl.fr;+ let vis = g.tl.vis;+ let cw = &g.tl.cw;+ let actions = &mut g.tl.actions;+ let lp = g.lp.clone();+ let ui_actions = &mut g.ui_actions;+ let layer = rc.layer;+ let cy = rc.cy;+ let uid = &prop.uid;++ // Keyframe navigator (in the A/V column, like AE).+ // (in the Keys column when it is shown).+ if prop.is_animated() && (vis.keys || vis.av) {+ let lt = layer.layer_time(time);+ let at_key = effectcraft_engine::keyframe::key_at(&prop.keys, lt).is_some();+ let nav_x = if vis.keys { cw.keys + 12.0 } else { cw.av + 18.0 };+ let prev = Rect::from_center_size(pos2(nav_x, cy), vec2(12.0, 14.0));+ let mid = Rect::from_center_size(pos2(nav_x + 16.0, cy), vec2(14.0, 14.0));+ let next = Rect::from_center_size(pos2(nav_x + 32.0, cy), vec2(12.0, 14.0));+ icons::paint(&lp, prev.shrink(2.0), Icon::ChevronLeft, t.text_dim);+ icons::paint(&lp, next.shrink(2.0), Icon::ChevronRight, t.text_dim);+ let kc = if at_key { t.keyframe_selected } else { Color32::TRANSPARENT };+ lp.add(egui::Shape::convex_polygon(+ vec![mid.center() + vec2(0.0, -5.0), mid.center() + vec2(5.0, 0.0), mid.center() + vec2(0.0, 5.0), mid.center() + vec2(-5.0, 0.0)],+ kc,+ Stroke::new(1.0, t.text_dim),+ ));+ if ui.interact(prev, egui::Id::unique(("kprev", uid)), Sense::click()).clicked()+ && let Some(k) = prop.keys.iter().rev().find(|k| layer.comp_time(k.time).0 < time.0 - fr.frame_duration().0 / 2)+ {+ ui_actions.push(UiAct::SetTime(layer.comp_time(k.time)));+ }+ if ui.interact(next, egui::Id::unique(("knext", uid)), Sense::click()).clicked()+ && let Some(k) = prop.keys.iter().find(|k| layer.comp_time(k.time).0 > time.0 + fr.frame_duration().0 / 2)+ {+ ui_actions.push(UiAct::SetTime(layer.comp_time(k.time)));+ }+ if ui.interact(mid, egui::Id::unique(("kmid", uid)), Sense::click()).clicked() {+ actions.push(("prop.toggleKey".into(), json!({"layer": layer.id.0, "prop": uid})));+ }+ app.auto.add(&format!("timeline.prop.{uid}.addKey"), mid, "Add or remove keyframe");+ }+ }++ /// The stopwatch.+ fn prop_stopwatch(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>, prop: &Property) {+ let t = g.tl.t;+ let ctx = g.tl.ctx.clone();+ let actions = &mut g.tl.actions;+ let lp = g.lp.clone();+ let layer = rc.layer;+ let r = rc.r;+ let cy = rc.cy;+ let indent = rc.indent;+ let uid = &prop.uid;++ // Stopwatch: Alt+click adds an expression; a press toggles the animation, and+ // dragging on over other stopwatches gives them the same state (#284).+ if !prop.static_only {+ let swr = Rect::from_center_size(pos2(indent, cy), vec2(15.0, 15.0));+ let resp = ui.interact(swr, egui::Id::unique(("stopwatch", uid)), Sense::click_and_drag());+ let col = if prop.is_animated() {+ t.hot_text+ } else if resp.hovered() {+ t.text+ } else {+ t.text_dim+ };+ icons::paint(&lp, swr, Icon::Stopwatch, col);+ app.auto.add(&format!("timeline.prop.{uid}.stopwatch"), swr, &prop.name);+ if ui.input(|i| i.modifiers.alt) {+ if resp.clicked() {+ actions.push(("prop.setExpression".into(), json!({"layer": layer.id.0, "prop": uid})));+ if prop.expr.is_none() {+ // Adding one: its editor opens, comes into view and takes the+ // keyboard with the new expression selected (#1072).+ app.ui.timeline.expr_closed.remove(uid);+ focus_expression(&ctx, *uid, [usize::MAX, 0]);+ } else if ctx.data(|d| d.get_temp::<ExprFocus>(expr_focus_id())).is_some_and(|f| f.prop == *uid) {+ // Removing it: nothing is left to take the keyboard.ctx.data_mut(|d| d.remove::<ExprFocus>(expr_focus_id()));- buf = ex.text.clone();- let n = buf.chars().count();- let [a, b] = f.select.map(|before_end| egui::text::CCursor::new(n.saturating_sub(before_end)));- let mut st = egui::text_edit::TextEditState::load(&ctx, edit_id).unwrap_or_default();- st.cursor.set_char_range(Some(egui::text::CCursorRange::two(a, b)));- st.store(&ctx, edit_id);- ctx.memory_mut(|m| m.request_focus(edit_id));- }- // Settings ▸ Scripting & Expressions ▸ Expressions Editor.- let sp = app.session.prefs.scripting.clone();- let resp = super::expr_editor::editor(ui, edit_id, &mut buf, er, &sp, if ex.enabled { expr_col } else { t.text_dim }, *lines, &t);- app.auto.add(&format!("timeline.prop.{uid}.expression"), er, &prop.name);- // Its bottom edge drags to set its height in whole lines, as in After Effects.- let edge = Rect::from_min_max(pos2(er.min.x, r.max.y - 4.0), pos2(er.max.x, r.max.y));- let eresp = ui.interact(edge, egui::Id::unique(("expr-edge", uid)), Sense::drag());- app.auto.add(&format!("timeline.prop.{uid}.expressionHeight"), edge, "Expression field height");- if eresp.hovered() || eresp.dragged() {- ctx.set_cursor_icon(egui::CursorIcon::ResizeVertical);- }- if let Some(py) = eresp.interact_pointer_pos().filter(|_| eresp.dragged()).map(|p| p.y) {- let n = ((py - r.min.y) / rh).round().clamp(1.0, EXPR_MAX_LINES as f32);- app.ui.timeline.expr_lines.insert(*uid, n as usize);- }- let commit = resp.has_focus() && ui.input(|i| i.key_pressed(egui::Key::Enter) && (i.modifiers.command || i.modifiers.ctrl));- if commit {- resp.surrender_focus();- }- if resp.has_focus() && !commit {- ctx.data_mut(|d| d.insert_temp(buf_id, buf));- } else {- if (resp.lost_focus() || commit) && buf.trim_end() != ex.text {- actions.push(("prop.setExpression".into(), json!({"layer": layer.id.0, "prop": uid, "expression": buf.trim_end()})));- }- ctx.data_mut(|d| d.remove::<String>(buf_id));}}- RowKind::Prop { uid } => {- let Some(prop) = layer.props.find(*uid) else { continue };- app.auto.add(&format!("timeline.prop.{uid}.row"), r, &prop.name);- let sel_prop = app.session.state.selected_props.contains(&(layer.id, *uid));- lp.rect_filled(- left,- 0.0,- if sel_prop {- t.row_selected- } else if ri % 2 == 0 {- t.row- } else {- t.row_alt- },- );- gp.rect_filled(Rect::from_min_max(pos2(graph_x0, r.min.y), r.max), 0.0, t.tl_bg);- let indent = cw.name + 6.0 + 14.0 * row.depth as f32;- // Keyframe navigator (in the A/V column, like AE).- // (in the Keys column when it is shown).- if prop.is_animated() && (vis.keys || vis.av) {- let lt = layer.layer_time(time);- let at_key = effectcraft_engine::keyframe::key_at(&prop.keys, lt).is_some();- let nav_x = if vis.keys { cw.keys + 12.0 } else { cw.av + 18.0 };- let prev = Rect::from_center_size(pos2(nav_x, cy), vec2(12.0, 14.0));- let mid = Rect::from_center_size(pos2(nav_x + 16.0, cy), vec2(14.0, 14.0));- let next = Rect::from_center_size(pos2(nav_x + 32.0, cy), vec2(12.0, 14.0));- icons::paint(&lp, prev.shrink(2.0), Icon::ChevronLeft, t.text_dim);- icons::paint(&lp, next.shrink(2.0), Icon::ChevronRight, t.text_dim);- let kc = if at_key { t.keyframe_selected } else { Color32::TRANSPARENT };- lp.add(egui::Shape::convex_polygon(- vec![mid.center() + vec2(0.0, -5.0), mid.center() + vec2(5.0, 0.0), mid.center() + vec2(0.0, 5.0), mid.center() + vec2(-5.0, 0.0)],- kc,- Stroke::new(1.0, t.text_dim),- ));- if ui.interact(prev, egui::Id::unique(("kprev", uid)), Sense::click()).clicked()- && let Some(k) = prop.keys.iter().rev().find(|k| layer.comp_time(k.time).0 < time.0 - fr.frame_duration().0 / 2)- {- ui_actions.push(UiAct::SetTime(layer.comp_time(k.time)));- }- if ui.interact(next, egui::Id::unique(("knext", uid)), Sense::click()).clicked()- && let Some(k) = prop.keys.iter().find(|k| layer.comp_time(k.time).0 > time.0 + fr.frame_duration().0 / 2)- {- ui_actions.push(UiAct::SetTime(layer.comp_time(k.time)));- }- if ui.interact(mid, egui::Id::unique(("kmid", uid)), Sense::click()).clicked() {- actions.push(("prop.toggleKey".into(), json!({"layer": layer.id.0, "prop": uid})));- }- app.auto.add(&format!("timeline.prop.{uid}.addKey"), mid, "Add or remove keyframe");- }- // Stopwatch: Alt+click adds an expression; a press toggles the animation, and- // dragging on over other stopwatches gives them the same state (#284).- if !prop.static_only {- let swr = Rect::from_center_size(pos2(indent, cy), vec2(15.0, 15.0));- let resp = ui.interact(swr, egui::Id::unique(("stopwatch", uid)), Sense::click_and_drag());- let col = if prop.is_animated() {- t.hot_text- } else if resp.hovered() {- t.text- } else {- t.text_dim- };- icons::paint(&lp, swr, Icon::Stopwatch, col);- app.auto.add(&format!("timeline.prop.{uid}.stopwatch"), swr, &prop.name);- if ui.input(|i| i.modifiers.alt) {- if resp.clicked() {- actions.push(("prop.setExpression".into(), json!({"layer": layer.id.0, "prop": uid})));- if prop.expr.is_none() {- // Adding one: its editor opens, comes into view and takes the- // keyboard with the new expression selected (#1072).- app.ui.timeline.expr_closed.remove(uid);- focus_expression(&ctx, *uid, [usize::MAX, 0]);- } else if ctx.data(|d| d.get_temp::<ExprFocus>(expr_focus_id())).is_some_and(|f| f.prop == *uid) {- // Removing it: nothing is left to take the keyboard.- ctx.data_mut(|d| d.remove::<ExprFocus>(expr_focus_id()));- }- }- } else if let Some((value, merge)) = switch_gesture(ui, &resp, r, "stopwatch", prop.is_animated()) {- actions.push(("prop.toggleAnimation".into(), json!({"layer": layer.id.0, "prop": uid, "value": value, "merge": merge})));- } else if resp.clicked() && !resp.clicked_by(egui::PointerButton::Primary) {- // Keyboard or accessibility activation.- actions.push(("prop.toggleAnimation".into(), json!({"layer": layer.id.0, "prop": uid})));- }- }- let name_x = indent + 12.0;- // 3D layers show Rotation as "Z Rotation" next to X/Y Rotation.- let is_tr_rot = layer.transform().and_then(|t| t.get("rotation")).is_some_and(|r| r.uid == prop.uid);- let base = if is_tr_rot && prop.name == "Rotation" && layer.is_3d() { "Z Rotation".to_string() } else { prop.name.clone() };- let pname = if prop.has_expression() { format!("{base} =") } else { base };- lp.text(pos2(name_x, cy), Align2::LEFT_CENTER, &pname, Tokens::ui(12.0), if prop.has_expression() { t.expr_text } else { t.text });- let name_rect = Rect::from_min_max(pos2(name_x, r.min.y), pos2(cw.switches - 2.0, r.max.y));- let name_resp = ui.interact(name_rect, egui::Id::unique(("pname", uid)), Sense::click_and_drag());- app.auto.add(&format!("timeline.prop.{uid}.name"), name_rect, &prop.name);- if name_resp.drag_started() {- // Drop on the Essential Graphics panel to expose the property.- egui::DragAndDrop::set_payload(&ctx, crate::panels::DragPayload::Property { layer: layer.id.0, prop: *uid });- }- if name_resp.dragged() {- egui::Tooltip::always_open(ctx.clone(), ui.layer_id(), egui::Id::unique("prop-drag-tip"), egui::PopupAnchor::Pointer)- .show(|ui| ui.label(&prop.name));- }- if name_resp.clicked() {- actions.push(("prop.select".into(), json!({"layer": layer.id.0, "prop": uid, "add": ui.input(|i| i.modifiers.shift)})));- }- crate::widgets::context_menu(&name_resp, |ui| prop_menu(ui, &mut app.auto, cid, layer, prop, &mut actions));- // Value editors.- let value = ectx.value(layer, prop);- let vx = (cw.switches + 4.0).max(name_x + 120.0);- let dims = value_editor(app, ui, &lp, layer, prop, &value, pos2(vx, cy), &mut actions);- if !dims.is_empty() {- dim_hits.push((*uid, dims));- }- // The property pick whip (Parent & Link column, AE CC 2018 and later): dropped on- // a property it links this one to it, adding the expression if there is none.- if vis.parent && !prop.static_only {- pick_whip(- app,- ui,- &lp,- Rect::from_center_size(pos2(cw.parent + 9.0, cy), vec2(15.0, 15.0)),- (WHIP_PROP, layer.id.0, *uid),- &format!("timeline.prop.{uid}.propertyPickWhip"),- "Property pick whip",- crate::i18n::tr("Property pick whip: drag onto a property"),- );- }- ui.set_clip_rect(right_clip);- // Expression text row hint.- if let Some(e) = prop.expr.as_ref().filter(|e| e.enabled && app.ui.timeline.expr_closed.contains(uid)) {- gp.text(- pos2(graph_x0 + 8.0, cy),- Align2::LEFT_CENTER,- format!("= {}", e.text.lines().next().unwrap_or("")),- Tokens::mono(11.0),- t.expr_text,- );- }- // Keyframes.- if !graph_on {- for k in &prop.keys {- let ct = layer.comp_time(k.time);- let x = tm.x(ct.seconds());- if x < graph_x0 - 8.0 || x > rect.max.x + 8.0 {- continue;- }- let kref = effectcraft_engine::KeyRef { layer: layer.id, prop: *uid, time: k.time };- let ks = sel_keys.contains(&kref);- let icon = k.icon();- let c = pos2(x, cy);- // Labelled keys take their label colour (brighter when selected).- let kcol = match effectcraft_engine::color::Label::ALL.get(k.label as usize).filter(|_| k.label > 0) {- Some(l) => {- let c = t.label(*l);- if ks { c } else { c.gamma_multiply(0.75) }- }- None if ks => t.keyframe_selected,- None => t.keyframe,- };- if k.roving {- // Roving keys: a small dot (their time follows their neighbours).- gp.circle_filled(c, 2.5, kcol);- } else {- icons::keyframe(&gp, c, 11.0, icon.left, icon.right, kcol);- }- let kr = Rect::from_center_size(c, vec2(12.0, 14.0));- let kresp = ui.interact(kr, egui::Id::unique(("key", uid, k.time.0)), Sense::click_and_drag());- app.auto.add(&format!("timeline.key.{uid}.{}", fr.frame_at(ct)), kr, &format!("{} key", prop.name));- // Exact (layer-time ticks): keys a Quick Offset puts on subframes can share a frame.- app.auto.add(&format!("timeline.keyAt.{uid}.{}", k.time.0), kr, &format!("{} key", prop.name));- let mods = ui.input(|i| i.modifiers);- let this_key = json!({"keys": [{"layer": layer.id.0, "prop": uid, "time": k.time.seconds()}], "selectProperties": true});- if kresp.clicked() && mods.command {- // Ctrl+click: Linear ↔ Auto Bezier; Ctrl+Alt+click: Hold on / off.- actions.push(("keys.select".into(), this_key.clone()));- if mods.alt {- actions.push(("keys.toggleHold".into(), json!({})));- } else {- let linear = k.in_interp == Interp::Linear && k.out_interp == Interp::Linear;- actions.push(("keys.interpolation".into(), json!({"interpolation": if linear { "autoBezier" } else { "linear" }})));- }- } else if kresp.clicked() && mods.shift {- // Shift+click: in or out of the selection.- let mut p = this_key.clone();- p["toggle"] = json!(true);- actions.push(("keys.select".into(), p));- } else if (kresp.clicked() || kresp.drag_started()) && !ks {- let mut p = this_key.clone();- p["add"] = json!(mods.shift);- actions.push(("keys.select".into(), p));- }- if kresp.double_clicked() {- // Edit the key's value (numeric properties), as After Effects does.- if matches!(k.value, Value::Scalar(_) | Value::Vec2(_) | Value::Vec3(_)) {- actions.push(("keys.set".into(), json!({"layer": layer.id.0, "prop": uid, "time": k.time.seconds()})));- } else {- ui_actions.push(UiAct::SetTime(ct));- }- }- crate::widgets::context_menu(&kresp, |ui| {- for (lbl, cmd, params) in [- ("Edit Value…", "keys.set", json!({"layer": layer.id.0, "prop": uid, "time": k.time.seconds()})),- ("-", "", json!({})),- ("Copy", "keys.copy", json!({})),- ("Paste", "keys.paste", json!({})),- ("-", "", json!({})),- ("Select Equal Keyframes", "keys.selectEqual", json!({})),- ("Select Previous Keyframes", "keys.selectPrevious", json!({})),- ("Select Following Keyframes", "keys.selectFollowing", json!({})),- ("-", "", json!({})),- ("Keyframe Interpolation…", "keys.interpolation", json!({})),- ("Keyframe Velocity…", "keys.velocity", json!({})),- ("Toggle Hold Keyframe", "keys.toggleHold", json!({})),- ("Rove Across Time", "keys.interpolation", json!({"roving": !k.roving})),- ("-", "", json!({})),- ("Easy Ease", "keys.easyEase", json!({})),- ("Easy Ease In", "keys.easyEaseIn", json!({})),- ("Easy Ease Out", "keys.easyEaseOut", json!({})),- ("Time-Reverse Keyframes", "keys.timeReverse", json!({})),- ("-", "", json!({})),- ("Linear", "keys.interpolation", json!({"interpolation": "linear"})),- ("Bezier", "keys.interpolation", json!({"interpolation": "bezier"})),- ("Auto Bezier", "keys.interpolation", json!({"interpolation": "autoBezier"})),- ("Select All Keyframes", "keys.selectAll", json!({})),- ("Delete", "keys.delete", json!({})),- ] {- if lbl == "Select All Keyframes" {- // Keyframe colour labels.- ui.menu_button(crate::i18n::tr("Label"), |ui| {- for (i, l) in effectcraft_engine::color::Label::ALL.into_iter().enumerate() {- if widgets::label_entry(ui, l, &app.session.prefs.label_name(l), k.label as usize == i, &t).clicked() {- if !ks {- actions.push((- "keys.select".into(),- json!({"keys": [{"layer": layer.id.0, "prop": uid, "time": k.time.seconds()}]}),- ));- }- actions.push(("keys.setLabel".into(), json!({"label": i})));- ui.close();- }- }- });- }- if lbl == "-" {- ui.separator();- continue;- }- if lbl == "Rove Across Time" && !prop.spatial {- continue;- }- if lbl == "Edit Value…" && !matches!(k.value, Value::Scalar(_) | Value::Vec2(_) | Value::Vec3(_)) {- continue;- }- if ui.button(lbl).clicked() {- if !ks {- actions.push(("keys.select".into(), json!({"keys": [{"layer": layer.id.0, "prop": uid, "time": k.time.seconds()}]})));- }- actions.push((cmd.into(), params));- ui.close();- }- }- });- // Alt-drag the first or last key of a selected group: scale the group in time.- if kresp.drag_started()- && mods.alt- && !mods.command- && let Some(c) = app.session.active_comp_arc()- {- super::graph_tools::alt_scale_begin(app, &ctx, &c, ct.seconds());- }- // A plain drag moves the selected keys. The timeline follows it (below): this- // widget's id changes with the key's time, so its own drag would end after- // the first frame of movement.- // (From where the button went down: a drag starts a few pixels later.)- if kresp.drag_started()- && !super::graph_tools::alt_scale_active(&ctx)- && let Some(p) = ctx.input(|i| i.pointer.press_origin())- {- // Ctrl/Cmd+Alt: Quick Offset of the selected keys' layers (#1012).- let quick = (mods.command && mods.alt && ks).then(|| quick_offset_layers(&comp, sel_keys.iter().map(|k| k.layer))).flatten();- ctx.data_mut(|d| d.insert_temp(key_drag_id(), KeyDrag { origin_x: p.x, anchor: ct.seconds(), applied: 0, quick }));+ } else if let Some((value, merge)) = switch_gesture(ui, &resp, r, "stopwatch", prop.is_animated()) {+ actions.push(("prop.toggleAnimation".into(), json!({"layer": layer.id.0, "prop": uid, "value": value, "merge": merge})));+ } else if resp.clicked() && !resp.clicked_by(egui::PointerButton::Primary) {+ // Keyboard or accessibility activation.+ actions.push(("prop.toggleAnimation".into(), json!({"layer": layer.id.0, "prop": uid})));+ }+ }+ }++ /// The property name; returns its x.+ fn prop_name(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>, prop: &Property) -> f32 {+ let t = g.tl.t;+ let cid = g.tl.cid;+ let ctx = g.tl.ctx.clone();+ let cw = &g.tl.cw;+ let actions = &mut g.tl.actions;+ let lp = g.lp.clone();+ let layer = rc.layer;+ let r = rc.r;+ let cy = rc.cy;+ let indent = rc.indent;+ let uid = &prop.uid;++ let name_x = indent + 12.0;+ // 3D layers show Rotation as "Z Rotation" next to X/Y Rotation.+ let is_tr_rot = layer.transform().and_then(|t| t.get("rotation")).is_some_and(|r| r.uid == prop.uid);+ let base = if is_tr_rot && prop.name == "Rotation" && layer.is_3d() { "Z Rotation".to_string() } else { prop.name.clone() };+ let pname = if prop.has_expression() { format!("{base} =") } else { base };+ lp.text(pos2(name_x, cy), Align2::LEFT_CENTER, &pname, Tokens::ui(12.0), if prop.has_expression() { t.expr_text } else { t.text });+ let name_rect = Rect::from_min_max(pos2(name_x, r.min.y), pos2(cw.switches - 2.0, r.max.y));+ let name_resp = ui.interact(name_rect, egui::Id::unique(("pname", uid)), Sense::click_and_drag());+ app.auto.add(&format!("timeline.prop.{uid}.name"), name_rect, &prop.name);+ if name_resp.drag_started() {+ // Drop on the Essential Graphics panel to expose the property.+ egui::DragAndDrop::set_payload(&ctx, crate::panels::DragPayload::Property { layer: layer.id.0, prop: *uid });+ }+ if name_resp.dragged() {+ egui::Tooltip::always_open(ctx.clone(), ui.layer_id(), egui::Id::unique("prop-drag-tip"), egui::PopupAnchor::Pointer).show(|ui| ui.label(&prop.name));+ }+ if name_resp.clicked() {+ actions.push(("prop.select".into(), json!({"layer": layer.id.0, "prop": uid, "add": ui.input(|i| i.modifiers.shift)})));+ }+ crate::widgets::context_menu(&name_resp, |ui| prop_menu(ui, &mut app.auto, cid, layer, prop, &mut *actions));+ name_x+ }++ /// The value editors and the property pick whip.+ fn prop_value_cell(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>, ectx: &EvalCtx<'_>, prop: &Property, name_x: f32) {+ let vis = g.tl.vis;+ let cw = &g.tl.cw;+ let actions = &mut g.tl.actions;+ let lp = g.lp.clone();+ let dim_hits = &mut g.dim_hits;+ let layer = rc.layer;+ let cy = rc.cy;+ let uid = &prop.uid;++ let value = ectx.value(layer, prop);+ let vx = (cw.switches + 4.0).max(name_x + 120.0);+ let ve = ValueEdit::new(ui, &lp, layer, prop, pos2(vx, cy));+ let dims = value_editor(app, ui, &ve, &value, &mut *actions);+ if !dims.is_empty() {+ dim_hits.push((*uid, dims));+ }+ // The property pick whip (Parent & Link column, AE CC 2018 and later): dropped on+ // a property it links this one to it, adding the expression if there is none.+ if vis.parent && !prop.static_only {+ pick_whip(+ app,+ ui,+ &lp,+ Rect::from_center_size(pos2(cw.parent + 9.0, cy), vec2(15.0, 15.0)),+ (WHIP_PROP, layer.id.0, *uid),+ WhipText {+ auto: &format!("timeline.prop.{uid}.propertyPickWhip"),+ label: "Property pick whip",+ hint: crate::i18n::tr("Property pick whip: drag onto a property"),+ },+ );+ }+ }++ /// The one-line expression hint when its editor is closed.+ fn prop_expression_hint(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &Rw, rc: &RowCtx<'_>, prop: &Property) {+ let t = g.tl.t;+ let graph_x0 = g.tl.graph_x0;+ let right_clip = g.right_clip;+ let gp = g.gp.clone();+ let cy = rc.cy;+ let uid = &prop.uid;++ ui.set_clip_rect(right_clip);+ // Expression text row hint.+ if let Some(e) = prop.expr.as_ref().filter(|e| e.enabled && app.ui.timeline.expr_closed.contains(uid)) {+ gp.text(pos2(graph_x0 + 8.0, cy), Align2::LEFT_CENTER, format!("= {}", e.text.lines().next().unwrap_or("")), Tokens::mono(11.0), t.expr_text);+ }+ }++ /// Key click selection and interpolation shortcuts.+ fn key_select(g: &mut Rw, kh: &KeyHit<'_>) {+ let KeyHit { k, ks, mods, ref kresp, ref this_key, .. } = *kh;+ let actions = &mut g.tl.actions;+ if kresp.clicked() && mods.command {+ // Ctrl+click: Linear ↔ Auto Bezier; Ctrl+Alt+click: Hold on / off.+ actions.push(("keys.select".into(), this_key.clone()));+ if mods.alt {+ actions.push(("keys.toggleHold".into(), json!({})));+ } else {+ let linear = k.in_interp == Interp::Linear && k.out_interp == Interp::Linear;+ actions.push(("keys.interpolation".into(), json!({"interpolation": if linear { "autoBezier" } else { "linear" }})));+ }+ } else if kresp.clicked() && mods.shift {+ // Shift+click: in or out of the selection.+ let mut p = this_key.clone();+ p["toggle"] = json!(true);+ actions.push(("keys.select".into(), p));+ } else if (kresp.clicked() || kresp.drag_started()) && !ks {+ let mut p = this_key.clone();+ p["add"] = json!(mods.shift);+ actions.push(("keys.select".into(), p));+ }+ }++ fn key_double_click(g: &mut Rw, rc: &RowCtx<'_>, prop: &Property, kh: &KeyHit<'_>) {+ let KeyHit { k, ct, ref kresp, .. } = *kh;+ let actions = &mut g.tl.actions;+ let ui_actions = &mut g.ui_actions;+ let layer = rc.layer;+ let uid = &prop.uid;++ if kresp.double_clicked() {+ // Edit the key's value (numeric properties), as After Effects does.+ if matches!(k.value, Value::Scalar(_) | Value::Vec2(_) | Value::Vec3(_)) {+ actions.push(("keys.set".into(), json!({"layer": layer.id.0, "prop": uid, "time": k.time.seconds()})));+ } else {+ ui_actions.push(UiAct::SetTime(ct));+ }+ }+ }++ /// The keyframe right-click menu.+ fn key_context_menu(app: &mut EffectcraftApp, g: &mut Rw, rc: &RowCtx<'_>, prop: &Property, kh: &KeyHit<'_>) {+ let KeyHit { k, ks, ref kresp, .. } = *kh;+ let t = g.tl.t;+ let actions = &mut g.tl.actions;+ let layer = rc.layer;+ let uid = &prop.uid;++ crate::widgets::context_menu(kresp, |ui| {+ for (lbl, cmd, params) in [+ ("Edit Value…", "keys.set", json!({"layer": layer.id.0, "prop": uid, "time": k.time.seconds()})),+ ("-", "", json!({})),+ ("Copy", "keys.copy", json!({})),+ ("Paste", "keys.paste", json!({})),+ ("-", "", json!({})),+ ("Select Equal Keyframes", "keys.selectEqual", json!({})),+ ("Select Previous Keyframes", "keys.selectPrevious", json!({})),+ ("Select Following Keyframes", "keys.selectFollowing", json!({})),+ ("-", "", json!({})),+ ("Keyframe Interpolation…", "keys.interpolation", json!({})),+ ("Keyframe Velocity…", "keys.velocity", json!({})),+ ("Toggle Hold Keyframe", "keys.toggleHold", json!({})),+ ("Rove Across Time", "keys.interpolation", json!({"roving": !k.roving})),+ ("-", "", json!({})),+ ("Easy Ease", "keys.easyEase", json!({})),+ ("Easy Ease In", "keys.easyEaseIn", json!({})),+ ("Easy Ease Out", "keys.easyEaseOut", json!({})),+ ("Time-Reverse Keyframes", "keys.timeReverse", json!({})),+ ("-", "", json!({})),+ ("Linear", "keys.interpolation", json!({"interpolation": "linear"})),+ ("Bezier", "keys.interpolation", json!({"interpolation": "bezier"})),+ ("Auto Bezier", "keys.interpolation", json!({"interpolation": "autoBezier"})),+ ("Select All Keyframes", "keys.selectAll", json!({})),+ ("Delete", "keys.delete", json!({})),+ ] {+ if lbl == "Select All Keyframes" {+ // Keyframe colour labels.+ ui.menu_button(crate::i18n::tr("Label"), |ui| {+ for (i, l) in effectcraft_engine::color::Label::ALL.into_iter().enumerate() {+ if widgets::label_entry(ui, l, &app.session.prefs.label_name(l), k.label as usize == i, &t).clicked() {+ if !ks {+ actions.push(("keys.select".into(), json!({"keys": [{"layer": layer.id.0, "prop": uid, "time": k.time.seconds()}]})));+ }+ actions.push(("keys.setLabel".into(), json!({"label": i})));+ ui.close();}}+ });+ }+ if lbl == "-" {+ ui.separator();+ continue;+ }+ if lbl == "Rove Across Time" && !prop.spatial {+ continue;+ }+ if lbl == "Edit Value…" && !matches!(k.value, Value::Scalar(_) | Value::Vec2(_) | Value::Vec3(_)) {+ continue;+ }+ if ui.button(lbl).clicked() {+ if !ks {+ actions.push(("keys.select".into(), json!({"keys": [{"layer": layer.id.0, "prop": uid, "time": k.time.seconds()}]})));}+ actions.push((cmd.into(), params));+ ui.close();}}+ });+ }++ /// Starts a key drag (or Alt-scale).+ fn key_drag_begin(app: &mut EffectcraftApp, g: &Rw, kh: &KeyHit<'_>) {+ let KeyHit { ct, ks, mods, ref kresp, .. } = *kh;+ let ctx = g.tl.ctx.clone();+ let comp = g.tl.comp.clone();+ let sel_keys = &g.sel_keys;+ // Alt-drag the first or last key of a selected group: scale the group in time.+ if kresp.drag_started()+ && mods.alt+ && !mods.command+ && let Some(c) = app.session.active_comp_arc()+ {+ super::graph_tools::alt_scale_begin(app, &ctx, &c, ct.seconds());+ }+ // A plain drag moves the selected keys. The timeline follows it (below): this+ // widget's id changes with the key's time, so its own drag would end after+ // the first frame of movement.+ // (From where the button went down: a drag starts a few pixels later.)+ if kresp.drag_started()+ && !super::graph_tools::alt_scale_active(&ctx)+ && let Some(p) = ctx.input(|i| i.pointer.press_origin())+ {+ // Ctrl/Cmd+Alt: Quick Offset of the selected keys' layers (#1012).+ let quick = (mods.command && mods.alt && ks).then(|| quick_offset_layers(&comp, sel_keys.iter().map(|k| k.layer))).flatten();+ ctx.data_mut(|d| d.insert_temp(key_drag_id(), KeyDrag { origin_x: p.x, anchor: ct.seconds(), applied: 0, quick }));+ }+ }++ /// Paints one keyframe marker; returns its hit rect.+ fn key_paint(g: &Rw, rc: &RowCtx<'_>, k: &effectcraft_engine::keyframe::Keyframe, x: f32, ks: bool) -> Rect {+ let t = g.tl.t;+ let gp = g.gp.clone();+ let cy = rc.cy;+ let icon = k.icon();+ let c = pos2(x, cy);+ // Labelled keys take their label colour (brighter when selected).+ let kcol = match effectcraft_engine::color::Label::ALL.get(k.label as usize).filter(|_| k.label > 0) {+ Some(l) => {+ let c = t.label(*l);+ if ks { c } else { c.gamma_multiply(0.75) }+ }+ None if ks => t.keyframe_selected,+ None => t.keyframe,+ };+ if k.roving {+ // Roving keys: a small dot (their time follows their neighbours).+ gp.circle_filled(c, 2.5, kcol);+ } else {+ icons::keyframe(&gp, c, 11.0, icon.left, icon.right, kcol);}+ Rect::from_center_size(c, vec2(12.0, 14.0))+ }++ /// The key's hit target and automation ids.+ fn key_hit(+ app: &mut EffectcraftApp,+ ui: &mut egui::Ui,+ g: &Rw,+ rc: &RowCtx<'_>,+ prop: &Property,+ k: &effectcraft_engine::keyframe::Keyframe,+ kr: Rect,+ ) -> egui::Response {+ let fr = g.tl.fr;+ let layer = rc.layer;+ let uid = &prop.uid;+ let ct = layer.comp_time(k.time);+ let kresp = ui.interact(kr, egui::Id::unique(("key", uid, k.time.0)), Sense::click_and_drag());+ app.auto.add(&format!("timeline.key.{uid}.{}", fr.frame_at(ct)), kr, &format!("{} key", prop.name));+ // Exact (layer-time ticks): keys a Quick Offset puts on subframes can share a frame.+ app.auto.add(&format!("timeline.keyAt.{uid}.{}", k.time.0), kr, &format!("{} key", prop.name));+ kresp+ }++ /// Right-click menus on the empty outline and graph areas.+ fn background_menus(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw) {+ let actions = &mut g.tl.actions;+ let graph_on = g.graph_on;+ let full_clip = g.full_clip;+ let empty_rect = g.empty_rect;+ let empty = g.empty.clone();+ let outline_empty = g.outline_empty.clone();ui.set_clip_rect(full_clip);// The background responses sit below rows, bars and editors, preserving their menus.if !graph_on {@@@ -3285,6 -4231,16 +4265,17 @@@ fn outline_marquee(ui: &mut egui::Ui, gactions.push(("layer.select".into(), json!({"layers": layers, "add": ui.input(|i| i.modifiers.shift || i.modifiers.command)})));}// Pick whips: a line follows the pointer; releasing over a row links to it (an expression's+ }++ /// A pick whip in flight: its line, the target and the link on release.+ fn pick_whip_drag(g: &mut Rw) {+ let t = g.tl.t;+ let graph_x0 = g.tl.graph_x0;+ let ctx = g.tl.ctx.clone();++ let comp = g.tl.comp.clone();+ let actions = &mut g.tl.actions;+ let hit_rows = &mut g.hit_rows;+ let dim_hits = &mut g.dim_hits;// or a property's, also over a property in Effect Controls).if let Some((kind, src_layer, src_prop, start)) = ctx.data(|d| d.get_temp::<PickWhip>(pick_whip_id())) {let ptr = ctx.input(|i| i.pointer.latest_pos()).unwrap_or(start);