Skip to content

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

Merge upstream main into fix/1284-testing-feedback

Kristian Myram9714fdac782c
diff --cc crates/ui-egui/src/menus.rs
index eb89e6ab0,8b5fd1c30..5f47a16bb
--- a/crates/ui-egui/src/menus.rs
+++ b/crates/ui-egui/src/menus.rs
@@@ -291,12 -318,15 +318,21 @@@ pub fn invoke(app: &mut EffectcraftApp
_ => {}
}
}
+ // Close follows panel focus too: with the Render Queue active, Cmd+W closes that panel and
+ // leaves the active composition open (it used to close the composition next to it).
+ if id == "file.close" && params.as_object().is_some_and(|p| p.is_empty()) && app.ui.focused == PanelKind::RenderQueue {
+ app.close_panel(PanelKind::RenderQueue);
+ return Ok(Value::Null);
+ }
+ // Edit ▸ Paste with SVG markup on the system clipboard pastes it as a shape layer (After
+ // Effects 26.3). Copying in the app replaces the system clipboard with a note naming what
+ // was copied, so SVG there was copied after anything copied in the app.
+ if id == "edit.paste" && no_params(&params) && app.session.state.text_edit.is_none() {
+ let text = ctx.data_mut(|d| d.remove_temp::<String>(system_paste_id())).or_else(|| app.hooks.clipboard_text.as_ref().and_then(|f| f()));
+ if let Some(svg) = text.filter(|t| effectcraft_engine::vector::is_svg_text(t)) {
+ return run_engine(app, ctx, "edit.pasteSvg", json!({"svg": svg}));
+ }
+ }
// Clear follows panel focus, including the Edit menu and keyboard shortcut.
if id == "edit.clear" && params.as_object().is_some_and(|p| p.is_empty()) && app.ui.focused == PanelKind::Project {
// Through `invoke`, so deleting items that compositions use still asks first (M3.16).