Skip to content

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

Merge pull request #1317

Brandon Thomas22072d9f2584
diff --cc crates/ui-egui/src/panels/effects_presets.rs
index 1d30cdcb5,a9410d98e..d2058fbea
--- a/crates/ui-egui/src/panels/effects_presets.rs
+++ b/crates/ui-egui/src/panels/effects_presets.rs
@@@ -8,10 -8,9 +8,10 @@@
use crate::i18n::tr;
use egui::{Align2, Color32, Rect, Sense, Stroke, pos2, vec2};
use serde_json::json;
+use std::sync::Arc;
use crate::icons::{self, Icon};
- use crate::panels::DragPayload;
+ use crate::panels::{DragPayload, PresetRef};
use crate::theme::Tokens;
use crate::{EffectcraftApp, widgets};
diff --cc crates/ui-egui/src/panels/timeline.rs
index e9660da36,b59a5d96f..b34fbd9d3
--- a/crates/ui-egui/src/panels/timeline.rs
+++ b/crates/ui-egui/src/panels/timeline.rs
@@@ -3355,21 -3330,18 +3356,28 @@@ pub fn show(app: &mut EffectcraftApp, u
&& let Some(ptr) = ctx.input(|i| i.pointer.hover_pos()).filter(|_| ui.rect_contains_pointer(rows_rect))
{
let released = ctx.input(|i| i.pointer.any_released());
- if let crate::panels::DragPayload::Effect(e) = payload.as_ref() {
+ if matches!(payload.as_ref(), crate::panels::DragPayload::Effect(_) | crate::panels::DragPayload::Preset { .. }) {
- p.rect_stroke(rows_rect, 0.0, Stroke::new(2.0, t.accent), StrokeKind::Inside);
let target = hit_rows.iter().find(|(r, _)| ptr.y >= r.min.y && ptr.y < r.max.y).map(|(_, row)| row.layer);
+ // The layer the effect would land on (its row and its open properties) is the one
+ // that lights up, not the whole timeline.
+ if let Some(l) = target
+ && let Some(span) = hit_rows.iter().filter(|(_, row)| row.layer == l).map(|(r, _)| *r).reduce(|a, b| a.union(b))
+ {
+ let lit = span.intersect(rows_rect);
+ let rp = p.with_clip_rect(rows_rect);
+ rp.rect_filled(lit, 0.0, t.accent.gamma_multiply(0.18));
+ rp.rect_stroke(lit, 0.0, Stroke::new(2.0, t.accent), StrokeKind::Inside);
+ app.auto.add("timeline.dropTarget", lit, "Drop target layer");
+ }
if released && let Some(l) = target {
- actions.push(("effect.apply".into(), json!({"effect": e, "layers": [l.0]})));
+ match payload.as_ref() {
+ crate::panels::DragPayload::Effect(e) => actions.push(("effect.apply".into(), json!({"effect": e, "layers": [l.0]}))),
+ crate::panels::DragPayload::Preset { preset, .. } => {
+ let (id, params) = preset.apply_to(l.0);
+ actions.push((id.into(), params));
+ }
+ _ => {}
+ }
}
} else {
let layer_rows: Vec<(Rect, LayerId)> = hit_rows.iter().filter(|(_, r)| matches!(r.kind, RowKind::Layer)).map(|(rr, r)| (*rr, r.layer)).collect();