Skip to content

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

Merge PR #547

Claude6308ca10885f
diff --cc crates/ui-egui/src/panels/detail.rs
index ffb120f2b,b13a0b47f..55ba3b748
--- a/crates/ui-egui/src/panels/detail.rs
+++ b/crates/ui-egui/src/panels/detail.rs
@@@ -317,10 -294,14 +325,15 @@@ fn request_window(app: &mut LightcraftA
app.window_refused = Some((c.id, c.look, frame_edge));
return None;
};
- // a drag renders drafts of the window, as it does of the whole frame
+ // a drag renders drafts of the window, as it does of the whole frame. The Before tile stays
+ // plain; the After tile carries the same mask overlay as the whole-frame render.
let job = if c.interacting { job.draft() } else { job };
+ let overlay = if v.before { lightcraft_pipeline::Overlay::None } else { c.overlay };
+ let job = if v.before { job } else { job.with_hidden_grading(app.ui.grading_hidden_for(c.id)) };
- let look = job.settings.hash64();
+ let job = job.with_overlay(overlay);
+ // The overlay is part of the tile's identity too, so changing mask view/colour never leaves a
+ // stale region tile on screen while its replacement renders.
+ let look = job.settings.hash64() ^ overlay.key().rotate_left(17);
let view = crate::region::RegionView { photo: c.id, before: v.before, key: job.key, full: (fw, fh), window: win, settings: look };
// windows of other photos, looks and zooms of this side can't be drawn any more
app.region_tiles.retain(|(before, _), t| *before != v.before || t.is_current(c.id, (fw, fh), look, c.interacting));
@@@ -456,8 -438,7 +470,8 @@@ pub fn show(app: &mut LightcraftApp, ui
let (sw, sh) = if aspect >= 1.0 { (se, (se as f32 / aspect) as usize) } else { ((se as f32 * aspect) as usize, se) };
if let Some(job) = app.session.loupe_job(id, rw.max(8), rh.max(8), !crop_tool) {
let job = if interacting { job.draft() } else { job };
- let job = job.with_overlay(view_overlay(app, &d)).with_proof(app.ui.soft_proof.then_some(app.ui.proof));
+ let job = job.with_overlay(overlay).with_proof(app.ui.soft_proof.then_some(app.ui.proof));
+ let job = job.with_hidden_grading(app.ui.grading_hidden_for(id));
app.renderer.request(Slot::Main, job, 100);
}
// hovering a preset or profile: the photo with that look, shown instead of the loupe render