EffectCraft: An open-source motion graphics and compositing tool written by scratch in pure Rust
Merge main into #2562; frame.rs: keep main's color_picker::note_dialog and the PR's scope_links call
bflatastic6cad825ec051
diff --cc crates/ui-egui/src/app/frame.rsindex 08b6086f9,9977af810..9308d7d6d--- a/crates/ui-egui/src/app/frame.rs+++ b/crates/ui-egui/src/app/frame.rs@@@ -406,8 -410,7 +410,9 @@@ impl EffectcraftApplet header = egui::Rect::from_min_size(egui::pos2(full.min.x, top), egui::vec2(full.width(), header_h));header::show(self, ui, header);let body = egui::Rect::from_min_max(egui::pos2(full.min.x + 4.0, header.max.y + 2.0), egui::pos2(full.max.x - 4.0, full.max.y - 4.0));+ // After the shortcuts, menus and header, which can replace the project (New, Open).+ self.ui.timeline.scope_links(self.session.script_ui.project_epoch);+ crate::color_picker::note_dialog(&ctx, self.dialog);self.dock_area(ui, body);#[cfg(not(target_arch = "wasm32"))]prefs_live::dropped_files(self, ui, full);