LightCraft: An open-source non-destructive photo editor written by scratch in pure Rust
Merge branch 'worktree-agent-aada35d252224c5cd'
Brandon Thomas59140d826546
diff --cc crates/engine/src/cmd/mod.rsindex 5d48e7d88,bf4582212..8a385ec56--- a/crates/engine/src/cmd/mod.rs+++ b/crates/engine/src/cmd/mod.rs@@@ -103,8 -103,8 +104,9 @@@ pub fn command_specs() -> &'static [Comv.extend(edit::specs());v.extend(library::specs());v.extend(develop::specs());+ v.extend(color::specs());v.extend(masks::specs());+ v.extend(organize::specs());v.extend(merge::specs());v.extend(query::specs());v.extend(xmp::specs());diff --cc crates/engine/src/media.rsindex f0b579c03,4a3327a08..e10b31a1e--- a/crates/engine/src/media.rs+++ b/crates/engine/src/media.rs@@@ -423,8 -408,15 +423,15 @@@ impl crate::Sessionlet level = SourceLevel::for_size(max_w.max(max_h));let source = self.media.source_ref(&p, level);let settings = if before { Arc::new(lightcraft_pipeline::before_settings(&p.develop)) } else { p.develop.clone() };- let request = RenderRequest { max_w, max_h, quality: Quality::Full, apply_crop };+ let request = RenderRequest { apply_crop, ..RenderRequest::fit(max_w, max_h) };- let key = settings.hash64() ^ ((max_w as u64) << 40) ^ ((max_h as u64) << 20) ^ (apply_crop as u64) ^ (level as u64) << 60;+ // the photo id is part of the key: two photos with the same settings and size must not+ // share a result (a view slot showing photo A would otherwise look current for photo B)+ let key = settings.hash64()+ ^ ((max_w as u64) << 40)+ ^ ((max_h as u64) << 20)+ ^ (apply_crop as u64)+ ^ (level as u64) << 60+ ^ id.0.wrapping_mul(0x9e37_79b9_7f4a_7c15);let cache = thumb_bucket.map(|b| {let k = Hasher128::new().str(&content_key(&p)).u64(settings.hash64()).u64(b as u64).u64(RENDER_CACHE_VERSION).finish();(self.media.rendered.clone(), k)diff --cc crates/ui-egui/src/menus.rsindex 9cebcea25,e0cc0d107..4d31a0024--- a/crates/ui-egui/src/menus.rs+++ b/crates/ui-egui/src/menus.rs@@@ -29,39 -34,40 +34,41 @@@ pub const UI_COMMANDS: &[UiCommand] = &("view.clipping", "Show Clipping", Some("J"), "View"),("view.histogram", "Histogram", Some("Cmd+Shift+H"), "View"),("view.maskOverlay", "Show Mask Overlay", Some("O"), "View"),+ ("view.visualizeSpots", "Visualize Spots", Some("A"), "View"),("view.cropOverlay", "Cycle Crop Overlay", Some("Shift+O"), "View"),- ("view.back", "Back to Grid", Some("Escape"), "View"),- ("view.filterBar", "Filter", None, "View"),- ("panel.edit", "Edit", Some("E"), "View"),- ("panel.crop", "Crop & Rotate", Some("C"), "View"),- ("panel.remove", "Remove", Some("H"), "View"),- ("panel.masking", "Masking", Some("M"), "View"),- ("panel.redeye", "Red Eye", None, "View"),- ("panel.presets", "Presets", Some("Shift+P"), "View"),- ("panel.info", "Info", Some("I"), "View"),- ("panel.keywords", "Keywords", Some("K"), "View"),- ("panel.versions", "Versions", Some("Shift+V"), "View"),- ("panel.activity", "History", None, "View"),- ("panel.close", "Close Panel", None, "View"),- ("section.light", "Light", Some("Cmd+Alt+1"), "View"),- ("section.color", "Color", Some("Cmd+Alt+2"), "View"),- ("section.effects", "Effects", Some("Cmd+Alt+3"), "View"),- ("section.detail", "Detail", Some("Cmd+Alt+4"), "View"),- ("section.optics", "Optics", Some("Cmd+Alt+5"), "View"),- ("tool.brush", "Brush", Some("B"), "View"),- ("tool.linear", "Linear Gradient", Some("L"), "View"),- ("tool.radial", "Radial Gradient", Some("R"), "View"),- ("tool.wbPicker", "White Balance Selector", Some("W"), "View"),- ("tool.none", "No Tool", None, "View"),+ ("view.back", "Back to Grid", Some("Escape"), ""),+ ("view.filterBar", "Filter Bar", Some("Shift+F"), "View"),+ ("panel.edit", "Edit", Some("E"), "Window"),+ ("panel.crop", "Crop & Rotate", Some("C"), "Window"),+ ("panel.remove", "Remove", Some("H"), "Window"),+ ("panel.masking", "Masking", Some("M"), "Window"),+ ("panel.redeye", "Red Eye", None, "Window"),+ ("panel.presets", "Presets", Some("Shift+P"), "Window"),+ ("panel.info", "Info", Some("I"), "Window"),+ ("panel.keywords", "Keywords", Some("K"), "Window"),+ ("panel.versions", "Versions", Some("Shift+V"), "Window"),+ ("panel.activity", "History", None, "Window"),+ ("panel.close", "Close Panel", None, ""),+ ("section.light", "Light", Some("Cmd+Alt+1"), "Window>Edit Sections"),+ ("section.color", "Color", Some("Cmd+Alt+2"), "Window>Edit Sections"),+ ("section.effects", "Effects", Some("Cmd+Alt+3"), "Window>Edit Sections"),+ ("section.detail", "Detail", Some("Cmd+Alt+4"), "Window>Edit Sections"),+ ("section.optics", "Optics", Some("Cmd+Alt+5"), "Window>Edit Sections"),+ ("tool.brush", "Brush", Some("B"), "Window>Tools"),+ ("tool.linear", "Linear Gradient", Some("L"), "Window>Tools"),+ ("tool.radial", "Radial Gradient", Some("R"), "Window>Tools"),+ ("tool.wbPicker", "White Balance Selector", Some("W"), "Window>Tools"),+ ("tool.none", "No Tool", None, ""),("dialog.newAlbum", "New Album…", Some("Cmd+N"), "File"),("dialog.newFolder", "New Folder…", Some("Cmd+Shift+N"), "File"),+ ("dialog.newSmartAlbum", "New Smart Album from Filter…", Some("Cmd+Alt+N"), "File"),("dialog.createPreset", "Create Preset…", Some("Cmd+Shift+P"), "Photo"),- ("dialog.copySettings", "Choose Edit Settings to Copy…", Some("Cmd+Shift+C"), "Photo"),+ ("dialog.autoStack", "Auto-Stack by Capture Time…", None, "Photo>Stack"),+ ("dialog.copySettings", "Choose Edit Settings to Copy…", Some("Cmd+Shift+C"), "Edit"),("dialog.export", "Export…", Some("Cmd+Shift+E"), "File"),- ("dialog.mergeHdr", "Photo Merge ▸ HDR…", Some("Ctrl+H"), "Photo"),- ("dialog.mergePanorama", "Photo Merge ▸ Panorama…", Some("Ctrl+M"), "Photo"),- ("dialog.mergeHdrPanorama", "Photo Merge ▸ HDR Panorama…", None, "Photo"),+ ("dialog.mergeHdr", "HDR…", Some("Ctrl+H"), "Photo>Photo Merge"),+ ("dialog.mergePanorama", "Panorama…", Some("Ctrl+M"), "Photo>Photo Merge"),+ ("dialog.mergeHdrPanorama", "HDR Panorama…", None, "Photo>Photo Merge"),("file.addPhotos", "Add Photos…", Some("Cmd+Shift+I"), "File"),("file.importPresets", "Import Presets…", None, "File"),("file.exportPresets", "Export Presets…", None, "File"),diff --cc crates/ui-egui/src/panels/detail.rsindex dc3aaad8f,186ffd55f..54e2575ef--- a/crates/ui-egui/src/panels/detail.rs+++ b/crates/ui-egui/src/panels/detail.rs@@@ -798,67 -725,9 +798,67 @@@ fn remove_overlay(app: &mut LightcraftA}}+// ------------------------------------------------------------------------ red eye++/// Red Eye tool: drag an ellipse over an eye (a new correction), click one to select it.+fn eye_overlay(app: &mut LightcraftApp, ui: &mut egui::Ui, resp: &egui::Response, map: &CanvasMap, d: &DevelopSettings) {+ // screen points per long-edge unit+ let o = map.screen(Point::new(0.0, 0.0));+ let (sx, sy) = (map.screen(Point::new(1.0, 0.0)).distance(o), map.screen(Point::new(0.0, 1.0)).distance(o));+ let per_long = sx.max(sy);+ let p = ui.painter();+ for (i, e) in d.red_eye.iter().enumerate() {+ let c = map.screen(e.center);+ let r = vec2(e.rx as f32 * per_long, e.ry as f32 * per_long);+ let sel = i == app.ui.eye;+ let col = if sel { Color32::WHITE } else { Color32::from_white_alpha(150) };+ p.add(egui::Shape::ellipse_stroke(c, r, Stroke::new(if sel { 1.5 } else { 1.0 }, col)));+ p.line_segment([c - vec2(4.0, 0.0), c + vec2(4.0, 0.0)], Stroke::new(1.0, col));+ p.line_segment([c - vec2(0.0, 4.0), c + vec2(0.0, 4.0)], Stroke::new(1.0, col));+ }+ if resp.hover_pos().is_some() {+ ui.ctx().set_cursor_icon(egui::CursorIcon::Crosshair);+ }+ if resp.drag_started()+ && let Some(q) = ui.input(|i| i.pointer.press_origin()).or(resp.interact_pointer_pos())+ {+ // from where the button went down (a drag is recognized only after some movement)+ app.gesture = Some(Gesture::Eye { a: map.norm(q) });+ }+ if let Some(Gesture::Eye { a }) = app.gesture+ && let Some(q) = resp.interact_pointer_pos()+ {+ let (a, b) = (map.screen(a), q);+ p.add(egui::Shape::ellipse_stroke(a.lerp(b, 0.5), ((b - a) / 2.0).abs(), Stroke::new(1.0, Color32::WHITE)));+ }+ if resp.drag_stopped()+ && let Some(Gesture::Eye { a }) = app.gesture.take()+ && let Some(q) = resp.interact_pointer_pos()+ {+ let (sa, sb) = (map.screen(a), q);+ let half = ((sb - sa) / 2.0).abs() / per_long;+ if half.x > 0.002 && half.y > 0.002 {+ let c = map.norm(sa.lerp(sb, 0.5));+ let r = app.run("redeye.add", json!({"center": [c.x, c.y], "rx": half.x, "ry": half.y, "pet": app.ui.eye_pet}));+ if let Ok(v) = r {+ app.ui.eye = v["index"].as_u64().unwrap_or(0) as usize;+ }+ }+ } else if resp.clicked()+ && let Some(q) = resp.interact_pointer_pos()+ && let Some(i) = d.red_eye.iter().position(|e| {+ let c = map.screen(e.center);+ let (dx, dy) = ((q.x - c.x) / (e.rx as f32 * per_long).max(4.0), (q.y - c.y) / (e.ry as f32 * per_long).max(4.0));+ dx * dx + dy * dy <= 1.0+ })+ {+ app.ui.eye = i;+ }+}+// ------------------------------------------------------------------------ filmstrip- fn filmstrip(app: &mut LightcraftApp, ui: &mut egui::Ui, r: Rect) {+ pub(crate) fn filmstrip(app: &mut LightcraftApp, ui: &mut egui::Ui, r: Rect) {let t = Tokens::get(ui.ctx());ui.painter().rect_filled(r, 0.0, t.canvas);ui.painter().rect_filled(Rect::from_min_size(r.min, vec2(r.width(), 4.0)), 0.0, Color32::from_gray(0x20));diff --cc crates/ui-egui/src/state.rsindex bd0afed90,f8914d63c..8e3ba2821--- a/crates/ui-egui/src/state.rs+++ b/crates/ui-egui/src/state.rs@@@ -111,16 -114,13 +114,23 @@@ pub struct UiStatepub brush_flow: f32,pub brush_erase: bool,pub remove_size: f32,+ /// Selected Point Color sample.+ pub point_color: usize,+ /// Point Color "Visualize range": the selected sample's range in colour, the rest grey.+ pub point_color_visualize: bool,+ /// Red Eye panel: selected correction, and whether new ones are pet eyes.+ pub eye: usize,+ pub eye_pet: bool,+ /// Remove tool: Visualize Spots (high-pass black/white view) and its threshold 0..100.+ pub visualize_spots: bool,+ pub spots_threshold: f32,+ /// The library filter bar above the grid.+ pub filter_bar: bool,+ /// Culling: after a rating, flag or colour-label key, move to the next photo.+ pub auto_advance: bool,+ /// Compare view: (select, candidate) photo ids.+ #[serde(skip)]+ pub compare: Option<(u64, u64)>,/// Transient toast text and its expiry (seconds of app time).#[serde(skip)]pub toast: Option<(String, f64)>,@@@ -193,12 -201,9 +211,15 @@@ impl Default for UiStatebrush_flow: 60.0,brush_erase: false,remove_size: 0.02,+ point_color: 0,+ point_color_visualize: false,+ eye: 0,+ eye_pet: false,+ visualize_spots: false,+ spots_threshold: 50.0,+ auto_advance: false,+ filter_bar: false,+ compare: None,toast: None,status: String::new(),dialog: None,