Skip to content

EffectCraft: An open-source motion graphics and compositing tool written by scratch in pure Rust

Merge pull request #1046 from vbasky/fix/872-shapes-from-text

Brandon Thomas9f985ff374df
diff --cc crates/ui-egui/src/panels/timeline.rs
index 27641e41c,068ec00f8..53799a0ef
--- a/crates/ui-egui/src/panels/timeline.rs
+++ b/crates/ui-egui/src/panels/timeline.rs
@@@ -2254,25 -2124,9 +2254,25 @@@ pub fn show(app: &mut EffectcraftApp, u
set_anchor(&ctx, cid, layer.id);
}
}
- layer_context_menu(&body, &comp, layer, &selected, vector_footage_layer(&app.session.project, layer), &mut actions);
+ layer_context_menu(&body, &comp, layer, &selected, LayerMenuCaps::of(&app.session.project, layer), &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::new(("bar-acc", layer.id.0, kind));
let mut acc: f32 = ctx.data(|d| d.get_temp(acc_id).unwrap_or(0.0));
diff --cc crates/ui-egui/tests/ui_workflow_selection.rs
index 6b46277df,93af3a35a..831d04bb2
--- a/crates/ui-egui/tests/ui_workflow_selection.rs
+++ b/crates/ui-egui/tests/ui_workflow_selection.rs
@@@ -509,43 -509,46 +509,87 @@@ fn project_context_move_to_root_acts_on
}
}
+/// Timeline right-click "Pre-compose…" groups every selected layer into one composition,
+/// like Layer > Pre-compose does, from both the outline row and the layer bar
+/// (#985, #1003).
+#[test]
+fn timeline_context_menu_precompose_groups_the_whole_selection() {
+ let right_click = |h: &mut Harness<'_, EffectcraftApp>, p: Pos2| {
+ for pressed in [true, false] {
+ h.input_mut().events.push(Event::PointerMoved(p));
+ h.input_mut().events.push(Event::PointerButton { pos: p, button: PointerButton::Secondary, pressed, modifiers: Modifiers::NONE });
+ h.step();
+ }
+ h.run_steps(3);
+ };
+ let row = |h: &Harness<'_, EffectcraftApp>, id: LayerId| {
+ let r = rect(h, &format!("timeline.layer.{}.row", id.0));
+ pos2(r.min.x + 210.0, r.center().y)
+ };
+ let bar = |h: &Harness<'_, EffectcraftApp>, id: LayerId| rect(h, &format!("timeline.layer.{}.bar", id.0)).center();
+ for via_bar in [false, true] {
+ let mut h = harness();
+ let ids: Vec<LayerId> = h.state().session.active_comp().unwrap().layers.iter().map(|l| l.id).collect();
+ let mut want: Vec<String> =
+ h.state().session.active_comp().unwrap().layers.iter().filter(|l| l.id == ids[0] || l.id == ids[1]).map(|l| l.name.clone()).collect();
+ want.sort();
+ h.state_mut().session.execute("layer.select", json!({"layers":[ids[0].0, ids[1].0]})).unwrap();
+ h.run_steps(3);
+ let p = if via_bar { bar(&h, ids[1]) } else { row(&h, ids[1]) };
+ right_click(&mut h, p);
+ h.get_by_label("Pre-compose…").click();
+ h.run_steps(3);
+ assert_eq!(h.state().dialog, Some(Dialog::Precompose), "via_bar={via_bar}: Pre-compose opens its dialog");
+ let ok = rect(&h, "dialog.precompose.ok").center();
+ click(&mut h, ok, Modifiers::NONE);
+ h.run_steps(3);
+ // The dialog opens the new composition holding both nested layers.
+ let mut nested: Vec<String> = h.state().session.active_comp().unwrap().layers.iter().map(|l| l.name.clone()).collect();
+ nested.sort();
+ assert_eq!(nested, want, "via_bar={via_bar}: both selected layers are nested");
+ }
+}
++
+ /// A text layer's timeline context menu offers Create Shapes from Text and Create Masks from
+ /// Text (After Effects), which convert the layer; a non-text layer does not show them (#872).
+ #[test]
+ fn timeline_context_menu_creates_shapes_and_masks_from_text() {
+ use effectcraft_engine::project::LayerSource;
+ let mut s = Session::default();
+ s.execute("comp.new", json!({"name":"Type","width":320,"height":180,"duration":4})).unwrap();
+ s.execute("layer.newText", json!({"text":"Abc"})).unwrap();
+ s.execute("layer.newSolid", json!({"name":"Plate","width":40,"height":40,"color":"#406080"})).unwrap();
+ s.execute("edit.deselectAll", json!({})).unwrap();
+ let text = s.active_comp().unwrap().layers.iter().find(|l| matches!(l.source, LayerSource::Text)).unwrap().id.0;
+ let plate = s.active_comp().unwrap().layers.iter().find(|l| l.name == "Plate").unwrap().id.0;
+ let mut h = Harness::builder().with_size(vec2(1600.0, 1000.0)).build_eframe(|_| EffectcraftApp::new(s));
+ h.run_steps(3);
+ let row = |h: &Harness<'_, EffectcraftApp>, id: u64| {
+ let r = rect(h, &format!("timeline.layer.{id}.row"));
+ pos2(r.min.x + 210.0, r.center().y)
+ };
+ let right_click = |h: &mut Harness<'_, EffectcraftApp>, p: Pos2| {
+ for pressed in [true, false] {
+ h.input_mut().events.push(Event::PointerMoved(p));
+ h.input_mut().events.push(Event::PointerButton { pos: p, button: PointerButton::Secondary, pressed, modifiers: Modifiers::NONE });
+ h.step();
+ }
+ h.run_steps(3);
+ };
+ // The text layer offers both conversions; Create Shapes from Text works.
+ h.state_mut().session.execute("layer.select", json!({"layers": [text]})).unwrap();
+ h.run_steps(3);
+ let at = row(&h, text);
+ right_click(&mut h, at);
+ h.get_by_label("Create Shapes from Text").click();
+ h.run_steps(3);
+ let shapes = h.state().session.active_comp().unwrap().layers.iter().filter(|l| matches!(l.source, LayerSource::Shape)).count();
+ assert_eq!(shapes, 1, "a shape layer was created from the text");
+ // A non-text layer does not show the text conversions.
+ h.state_mut().session.execute("layer.select", json!({"layers": [plate]})).unwrap();
+ h.run_steps(3);
+ let at = row(&h, plate);
+ right_click(&mut h, at);
+ assert!(h.query_by_label("Create Shapes from Text").is_none(), "no text conversion for a solid");
+ assert!(h.query_by_label("Create Masks from Text").is_none(), "no text conversion for a solid");
+ }