Skip to content

LightCraft: An open-source non-destructive photo editor written by scratch in pure Rust

Merge branch 'worktree-agent-a27a1456c70c1074d'

Brandon Thomasdb89203fb2a8
diff --cc crates/engine/src/lib.rs
index 6edde4b94,a3e57e0d9..63a93e400
--- a/crates/engine/src/lib.rs
+++ b/crates/engine/src/lib.rs
@@@ -359,6 -356,6 +362,8 @@@ mod tests_merge
#[cfg(test)]
mod tests_organize;
#[cfg(test)]
+mod tests_prefs;
+#[cfg(test)]
+ mod tests_spots;
+ #[cfg(test)]
mod tests_xmp;
diff --cc crates/ui-egui/src/panels/detail.rs
index 03d3c38df,ec43e17d6..420482ad2
--- a/crates/ui-egui/src/panels/detail.rs
+++ b/crates/ui-egui/src/panels/detail.rs
@@@ -440,12 -340,22 +448,25 @@@ fn targeted_drag(app: &mut LightcraftAp
}
}
- /// The diagnostic overlay the loupe shows (Point Color's visualized range).
- fn view_overlay(app: &LightcraftApp, d: &DevelopSettings) -> lightcraft_pipeline::Overlay {
- use lightcraft_pipeline::Overlay;
+ /// The diagnostic overlay the loupe shows (the selected mask, Point Color's visualized range,
+ /// Visualize Spots).
+ pub(crate) fn view_overlay(app: &LightcraftApp, d: &DevelopSettings) -> lightcraft_pipeline::Overlay {
+ use lightcraft_pipeline::{MaskView, Overlay};
+ if app.ui.fullscreen {
+ return Overlay::None;
+ }
+ if app.ui.right == RightPanel::Masking
+ && app.ui.mask_overlay
+ && let Some(m) = app.session.active_mask.and_then(|id| d.masks.iter().find(|m| m.id == id))
+ && !m.components.is_empty()
+ {
+ return Overlay::Mask {
+ id: m.id.min(u16::MAX as u32) as u16,
+ view: MaskView::parse(&app.ui.mask_overlay_mode).unwrap_or_default(),
+ color: app.ui.mask_overlay_color,
+ opacity: app.ui.mask_overlay_opacity.clamp(0.0, 100.0).round() as u8,
+ };
+ }
if app.ui.right == RightPanel::Remove && app.ui.visualize_spots {
return Overlay::Spots(app.ui.spots_threshold.clamp(0.0, 100.0).round() as u8);
}
diff --cc crates/ui-egui/src/shortcuts.rs
index 83a2bf782,ed4fcc8c0..be33a30cb
--- a/crates/ui-egui/src/shortcuts.rs
+++ b/crates/ui-egui/src/shortcuts.rs
@@@ -173,12 -170,15 +176,18 @@@ pub fn handle(app: &mut LightcraftApp,
}
continue;
}
- R::Remove | R::RedEye => continue,
+ R::Remove => {
+ if app.session.active_spot.is_some() {
+ let _ = app.run("spot.delete", json!({}));
+ }
+ continue;
+ }
+ R::RedEye => continue,
_ => {}
}
+ if crate::menus::confirm_delete(app) {
+ continue;
+ }
}
// X is both reject (library) and swap crop aspect (crop tool)
if f == "photo.reject" && app.ui.right == crate::state::RightPanel::Crop {
diff --cc docs/parity.md
index bd7bfb0dd,291cd8fd8..c4e840f3e
--- a/docs/parity.md
+++ b/docs/parity.md
@@@ -42,13 -42,13 +42,13 @@@ and prints the summary; `cargo xtask pa
| S. Export (EXP) | 6 | 6 | 6 | 0 | 3/7 (43%) | 3/7 (43%) |
| T. Share (SHARE) | 0 | 0 | 0 | 4 | — | — |
| U. Map & location (MAP) | 0 | 1 | 1 | 0 | — | 0/1 (0%) |
-| V. Preferences (PREF) | 0 | 3 | 5 | 3 | 0/1 (0%) | 0/4 (0%) |
+| V. Preferences (PREF) | 4 | 1 | 3 | 3 | 1/1 (100%) | 3/4 (75%) |
| W. Cloud & AI infrastructure (CLOUD / AI) | 0 | 1 | 1 | 2 | — | — |
| X. Cross-cutting behaviours (BEHAV) | 10 | 3 | 4 | 1 | 7/8 (88%) | 3/5 (60%) |
-| Y. Menus | 46 | 18 | 21 | 8 | 37/47 (79%) | 7/23 (30%) |
-| Z. Keyboard shortcuts (desktop) | 50 | 14 | 16 | 1 | 43/52 (83%) | 7/23 (30%) |
+| Y. Menus | 50 | 18 | 17 | 8 | 38/47 (81%) | 10/23 (43%) |
- | Z. Keyboard shortcuts (desktop) | 49 | 16 | 15 | 1 | 40/52 (77%) | 9/23 (39%) |
++| Z. Keyboard shortcuts (desktop) | 53 | 14 | 13 | 1 | 44/52 (85%) | 9/23 (39%) |
| Lightroom Classic extras | 4 | 19 | 56 | 9 | — | 3/21 (14%) |
- | **Total** | 230 | 99 | 171 | 37 | 159/198 (80%) | 62/144 (43%) |
-| **Total** | 225 | 93 | 182 | 37 | 165/198 (83%) | 51/144 (35%) |
++| **Total** | 240 | 91 | 169 | 37 | 168/198 (85%) | 63/144 (44%) |
<!-- /parity:summary -->
## Top gaps
@@@ -627,10 -620,10 +620,10 @@@ From `06-shortcuts.md` part 1. Evidenc
| KEY-SELECTALL | Select all — ⌘A | P0 | ✅ | `cmd:library.selectAll` | |
| KEY-SELECTNONE | Select none — ⌘D | P0 | ✅ | `cmd:library.selectNone` | secondary binding (primary ⌘⇧A) |
| KEY-PASTESELECTED | Paste selected — ⇧⌘V | P0 | ⬜ | | no command |
-| KEY-PREFS | Settings — ⌘, | P0 | ⬜ | | no command |
+| KEY-PREFS | Settings — ⌘, | P0 | ✅ | `cmd:app.settings` | |
| KEY-SEARCH | Search — ⌘F | P0 | ⬜ | | no focus-search command |
| KEY-VISUALIZESPOTS | Visualize spots — A | P1 | ⬜ | | |
- | KEY-CYCLEOVERLAY | Cycle overlay — O | P0 | 🟡 | `cmd:view.maskOverlay`, `cmd:view.cropOverlay` | O toggles the mask overlay; crop overlays cycle on ⇧O |
+ | KEY-CYCLEOVERLAY | Cycle overlay — O | P0 | ✅ | `cmd:view.maskOverlay`, `cmd:view.maskOverlayMode`, `cmd:view.cropOverlay` | O toggles the mask overlay; ⇧O cycles mask overlay modes while masking, crop overlays elsewhere |
| KEY-PHOTOSPANEL | Photos panel — P | P0 | 🟡 | `cmd:view.leftPanel` | bound to ⌘⇧L; P = pick |
| KEY-LINEAR | Linear gradient — L | P0 | ✅ | `cmd:tool.linear` | |
| KEY-RADIAL | Radial gradient — R | P0 | ✅ | `cmd:tool.radial` | |