Skip to content

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

Merge slideshow-playback into slideshow-composer (origin/main: batch 35)

Jason Baldwinb60c74a6d737
diff --cc crates/engine/src/import.rs
index 5ca8752d3,ecb80741e..3d019d022
--- a/crates/engine/src/import.rs
+++ b/crates/engine/src/import.rs
@@@ -1479,7 -1532,7 +1532,8 @@@ impl Session
stages: None,
view_cache: None,
display: None,
+ slide: None,
+ preview_cut: None,
};
let embedded = match (&self.media.preview_loader, c.kind) {
(Some(l), MediaKind::Raw) => Some((c.path.clone(), l.clone(), edge)),
diff --cc crates/engine/src/media.rs
index 22831bd79,0688410ed..1da8350f8
--- a/crates/engine/src/media.rs
+++ b/crates/engine/src/media.rs
@@@ -741,8 -752,9 +752,11 @@@ pub struct RenderJob
pub view_cache: Option<(Arc<PreviewCache>, Hash128)>,
/// Render for this monitor profile ([`Self::with_display`]).
pub display: Option<Arc<crate::display::Display>>,
+ /// Compose the render into a slideshow slide ([`Self::with_slide`]).
+ pub slide: Option<Arc<crate::slide::SlideCompose>>,
+ /// A face tile that can be cut from the raw's embedded preview, tried before `source`
+ /// ([`crate::Session::face_job`]; `None` for every other job).
+ pub preview_cut: Option<crate::face_tiles::PreviewCut>,
}
pub struct RenderResult {
@@@ -1218,7 -1227,7 +1253,8 @@@ impl crate::Session
stages: None,
view_cache: None,
display: None,
+ slide: None,
+ preview_cut: None,
})
}
@@@ -1270,7 -1279,7 +1306,8 @@@
stages: None,
view_cache: None,
display: None,
+ slide: None,
+ preview_cut: None,
})
}
@@@ -1317,7 -1332,7 +1360,8 @@@
stages: None,
view_cache: None,
display: None,
+ slide: None,
+ preview_cut,
})
}
diff --cc docs/parity-checklist.md
index bf62b881f,e9272d4dd..8f6429cc3
--- a/docs/parity-checklist.md
+++ b/docs/parity-checklist.md
@@@ -51,11 -51,11 +51,11 @@@ cited here still exists. Formerly docs/
| W. Cloud & AI infrastructure (CLOUD / AI) | 1 | 0 | 1 | 2 | — | — |
| X. Cross-cutting behaviours (BEHAV) | 23 | 6 | 1 | 1 | 8/8 (100%) | 7/10 (70%) |
| Y. Menus | 84 | 0 | 4 | 8 | 47/47 (100%) | 23/23 (100%) |
- | Z. Keyboard shortcuts (desktop) | 76 | 3 | 3 | 1 | 49/52 (94%) | 23/24 (96%) |
+ | Z. Keyboard shortcuts (desktop) | 76 | 4 | 3 | 1 | 49/52 (94%) | 23/25 (92%) |
-| Lightroom Classic extras | 34 | 17 | 34 | 8 | — | 24/26 (92%) |
-| **Total** | 409 | 54 | 71 | 35 | 193/201 (96%) | 146/159 (92%) |
+| Lightroom Classic extras | 36 | 18 | 31 | 8 | — | 24/26 (92%) |
- | **Total** | 411 | 54 | 68 | 35 | 193/201 (96%) | 146/158 (92%) |
++| **Total** | 411 | 55 | 68 | 35 | 193/201 (96%) | 146/159 (92%) |
- Weighted completion (✅ = 1, 🟡 = ½, 🚫 left out): **82.2%** of 533 in-scope rows — P0 98.0% of 201 · P1 95.3% of 158 · P2 51.7% of 173.
-Weighted completion (✅ = 1, 🟡 = ½, 🚫 left out): **81.6%** of 534 in-scope rows — P0 98.0% of 201 · P1 95.0% of 159 · P2 50.3% of 173.
++Weighted completion (✅ = 1, 🟡 = ½, 🚫 left out): **82.1%** of 534 in-scope rows — P0 98.0% of 201 · P1 95.0% of 159 · P2 51.7% of 173.
<!-- /parity:summary -->
## Top gaps and shortcut notes