Skip to content

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

Merge pull request #1413

Brandon Thomasc44c51212c6d
diff --cc crates/render/src/lib.rs
index 053dd07eb,45581d7f3..eccaed2f4
--- a/crates/render/src/lib.rs
+++ b/crates/render/src/lib.rs
@@@ -2402,10 -2400,10 +2414,12 @@@ mod tests_footage_size
#[cfg(test)]
mod tests_frame_blend;
#[cfg(test)]
+ mod tests_guides;
+ #[cfg(test)]
mod tests_mask_blur;
#[cfg(test)]
+mod tests_mask_expansion;
+#[cfg(test)]
mod tests_nested;
#[cfg(test)]
mod tests_paint;
diff --cc crates/ui-egui/src/panels/timeline.rs
index aff4ef2c8,d00dbd5e7..8a4febc6c
--- a/crates/ui-egui/src/panels/timeline.rs
+++ b/crates/ui-egui/src/panels/timeline.rs
@@@ -3971,33 -3978,9 +4006,34 @@@ pub(crate) fn layer_menu
item(ui, "Duplicate", "edit.duplicate", json!({"layers": layers}));
item(ui, "Split Layer", "edit.splitLayer", json!({"layers": layers}));
item(ui, "Delete", "edit.clear", json!({"layers": layers}));
+ actions.extend(switch_actions);
}
+/// The layer context menu's Layer Styles submenu, matching the Layer ▸ Layer Styles application menu.
+fn layer_styles_submenu(ui: &mut egui::Ui, layers: &[u64], item: &mut dyn FnMut(&mut egui::Ui, &str, &str, serde_json::Value)) {
+ item(ui, "Layer Style Options...", "layer.style.options", json!({}));
+ ui.separator();
+ item(ui, "Convert to Editable Styles", "layer.style.convertToEditable", json!({"layers": layers}));
+ item(ui, "Show All", "layer.style.showAll", json!({"layers": layers}));
+ item(ui, "Remove All", "layer.style.removeAll", json!({"layers": layers}));
+ ui.separator();
+ for (id, label) in effectcraft_engine::project::styles::STYLES {
+ let cmd = match *id {
+ "dropShadow" => "layer.style.dropShadow",
+ "innerShadow" => "layer.style.innerShadow",
+ "outerGlow" => "layer.style.outerGlow",
+ "innerGlow" => "layer.style.innerGlow",
+ "bevelEmboss" => "layer.style.bevelEmboss",
+ "satin" => "layer.style.satin",
+ "colorOverlay" => "layer.style.colorOverlay",
+ "gradientOverlay" => "layer.style.gradientOverlay",
+ "stroke" => "layer.style.stroke",
+ _ => continue,
+ };
+ item(ui, label, cmd, json!({}));
+ }
+}
+
/// The layer context menu's Effects submenu: every effect from the registry grouped by category,
/// in the same order as the Effect menu's palette, so the two stay in sync automatically.
fn effects_submenu(ui: &mut egui::Ui, layers: &[u64], item: &mut dyn FnMut(&mut egui::Ui, &str, &str, serde_json::Value)) {