LightCraft: An open-source non-destructive photo editor written by scratch in pure Rust
Merge branch 'worktree-agent-a5bfb1e4b62622bcb'
Brandon Thomas00efffd37218
diff --cc crates/engine/src/media.rsindex c2b6b845e,f89078272..91e13b3aa--- a/crates/engine/src/media.rs+++ b/crates/engine/src/media.rs@@@ -101,7 -92,8 +101,9 @@@ pub struct MediaCachepub preview_capacity: usize,pub file_loader: Option<FileLoader>,pub file_probe: Option<FileProbe>,+ pub preview_loader: Option<PreviewLoader>,+ /// Reads a photo file's bytes (Photo Merge); `None` = the local file system.+ pub file_bytes: Option<crate::merge::ByteReader>,scenes: Vec<lightcraft_scenes::Scene>,/// Rendered thumbnails (memory, plus disk once a library is attached).pub rendered: Arc<PreviewCache>,@@@ -116,7 -108,7 +118,8 @@@ impl Default for MediaCachepreview_capacity: 0,file_loader: None,file_probe: None,+ preview_loader: None,+ file_bytes: None,scenes: Vec::new(),rendered: Arc::new(PreviewCache::memory(RENDERED_MEM_BYTES)),}diff --cc crates/ui-egui/src/control.rsindex 4630ccc2a,53912d37e..0a15ad09f--- a/crates/ui-egui/src/control.rs+++ b/crates/ui-egui/src/control.rs@@@ -77,8 -77,7 +77,8 @@@ pub fn inspect(app: &LightcraftApp, ctx"selection": app.session.selection.ids.iter().map(|p| p.0).collect::<Vec<_>>(),"activeMask": app.session.active_mask,"widgetCount": app.widgets.len(),- "perf": {"frameMs": app.perf.frame_ms, "fps": app.perf.fps, "lastRenderMs": app.renderer.last_main_ms, "renderQueue": app.renderer.queued(), "rendersInFlight": app.renderer.in_flight(), "rendersDone": app.renderer.completed, "thumbTextures": app.renderer.thumb_textures(), "gpu": (lightcraft_engine::gpu::ready() && lightcraft_engine::gpu::available()).then(lightcraft_engine::gpu::adapter_name).flatten()},- "perf": {"frameMs": app.perf.frame_ms, "fps": app.perf.fps, "lastRenderMs": app.renderer.last_main_ms, "renderQueue": app.renderer.queued(), "rendersInFlight": app.renderer.in_flight(), "mergeRunning": app.merge.busy(), "lastMerge": app.merge.last_result, "rendersDone": app.renderer.completed, "thumbTextures": app.renderer.thumb_textures(), "gpu": lightcraft_engine::gpu::available().then(lightcraft_engine::gpu::adapter_name).flatten()},++ "perf": {"frameMs": app.perf.frame_ms, "fps": app.perf.fps, "lastRenderMs": app.renderer.last_main_ms, "renderQueue": app.renderer.queued(), "rendersInFlight": app.renderer.in_flight(), "mergeRunning": app.merge.busy(), "lastMerge": app.merge.last_result, "rendersDone": app.renderer.completed, "thumbTextures": app.renderer.thumb_textures(), "gpu": (lightcraft_engine::gpu::ready() && lightcraft_engine::gpu::available()).then(lightcraft_engine::gpu::adapter_name).flatten()},+ "loupe": app.loupe_shown.map(|(p, src)| json!({"photo": p.0, "source": src, "pending": app.renderer.is_pending(crate::render::Slot::Main)})),"status": app.ui.status,})}diff --cc crates/ui-egui/src/lib.rsindex ded4d51bb,3de5c6d08..37fd8f579--- a/crates/ui-egui/src/lib.rs+++ b/crates/ui-egui/src/lib.rs@@@ -84,9 -81,8 +85,11 @@@ pub struct LightcraftApppub widgets: Vec<(String, egui::Rect)>,/// In-progress on-canvas gesture (brush stroke points, gradient drag…).pub gesture: Option<panels::detail::Gesture>,+ /// What the loupe drew last frame: photo and source ("render", "cached", "embedded", "small",+ /// "thumb", "none").+ pub loupe_shown: Option<(lightcraft_catalog::PhotoId, &'static str)>,+ /// Photo Merge dialog previews and background merges.+ pub merge: merge::MergeState,}impl LightcraftApp {@@@ -114,7 -108,7 +117,8 @@@image_rect: None,widgets: vec![],gesture: None,+ loupe_shown: None,+ merge: merge::MergeState::default(),}}diff --cc crates/ui-egui/src/menus.rsindex 09ccb55af,a052fe257..b11cd6eda--- a/crates/ui-egui/src/menus.rs+++ b/crates/ui-egui/src/menus.rs@@@ -294,17 -280,13 +297,20 @@@ pub fn run_ui_command(app: &mut LightcrOk(Value::Null)}"dialog.export" => {- app.ui.dialog =- Some(Dialog::Export { opts: Default::default(), long_edge: 2048, limit_kb: 0, dir: crate::control::default_export_dir() });+ let prev = app.session.last_export.clone().unwrap_or_default();+ let u = |k: &str, d: u64| prev.get(k).and_then(Value::as_u64).unwrap_or(d);+ let dir = prev.get("dir").and_then(Value::as_str).map(str::to_string).unwrap_or_else(crate::control::default_export_dir);+ app.ui.dialog = Some(Dialog::Export {+ opts: lightcraft_engine::export::ExportOptions::from_json(&prev),+ long_edge: u("longEdge", 2048) as u32,+ limit_kb: u("limitKb", 0) as u32,+ dir,+ });Ok(Value::Null)}+ "dialog.mergeHdr" => crate::merge::open(app, "merge.hdr"),+ "dialog.mergePanorama" => crate::merge::open(app, "merge.panorama"),+ "dialog.mergeHdrPanorama" => crate::merge::open(app, "merge.hdrPanorama"),"app.about" => {app.ui.dialog = Some(Dialog::About);Ok(Value::Null)@@@ -391,16 -368,8 +397,17 @@@ pub fn ui_enabled(app: &LightcraftApp,match id {s if s.starts_with("panel.") || s.starts_with("tool.") || s.starts_with("section.") => app.session.active().is_some() || s == "panel.close","app.export" | "dialog.export" | "dialog.createPreset" | "dialog.copySettings" => app.session.active().is_some(),+ "app.exportPrevious" => app.session.active().is_some() && app.session.last_export.is_some(),+ "app.showInFinder" => {+ app.services.reveal.is_some()+ && app+ .session+ .active()+ .and_then(|id| app.session.catalog.photo(id))+ .is_some_and(|p| matches!(p.source, lightcraft_engine::catalog::Source::File { .. }))+ }"file.exportPresets" => app.session.presets.iter().any(|p| !p.builtin),+ s if s.starts_with("dialog.merge") => app.session.targets(&serde_json::json!({})).len() >= 2 && app.merge.final_task.is_none(),_ => true,}}diff --cc crates/ui-egui/src/shortcuts.rsindex fd0dd6490,a808c99fd..5cd47b75f--- a/crates/ui-egui/src/shortcuts.rs+++ b/crates/ui-egui/src/shortcuts.rs@@@ -51,10 -38,10 +51,11 @@@ pub fn parse(s: &str) -> Option<(Modififn matches(i: &egui::InputState, m: Modifiers, k: Key) -> bool {i.events.iter().any(|e| match e {egui::Event::Key { key, pressed: true, modifiers, .. } => {- (*key == k || (k == Key::Backspace && *key == Key::Delete))- && modifiers.command == m.command- && modifiers.shift == m.shift- && modifiers.alt == m.alt- // `Ctrl` is the physical Control key (on macOS distinct from Cmd; elsewhere Cmd = Ctrl)++ // `Ctrl` is the physical Control key (on macOS distinct from Cmd; elsewhere Cmd = Ctrl);++ // "Delete" (⌫ = Backspace) also matches forward-delete+ let ctrl_ok = if m.ctrl { modifiers.ctrl } else { !modifiers.ctrl || modifiers.command };+ let cmd_ok = m.ctrl || modifiers.command == m.command;- *key == k && ctrl_ok && cmd_ok && modifiers.shift == m.shift && modifiers.alt == m.alt++ (*key == k || (k == Key::Backspace && *key == Key::Delete)) && ctrl_ok && cmd_ok && modifiers.shift == m.shift && modifiers.alt == m.alt}_ => false,})