Skip to content

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

LR-BEHAV-TOAST: Auto-Tag from Tracklog's toast shows too

Nathaniel Ledforde2aa4d97627c
diff --git a/crates/ui-egui/src/menus.rs b/crates/ui-egui/src/menus.rs
index dc8644360..c15c2c22d 100644
--- a/crates/ui-egui/src/menus.rs
+++ b/crates/ui-egui/src/menus.rs
@@ -258,7 +258,8 @@ pub fn parse_rgb(v: &Value) -> Option<[u8; 3]> {
/// Handle UI commands; `None` means "not a UI command — send it to the engine".
pub fn run_ui_command(app: &mut LightcraftApp, id: &str, p: &Value) -> Option<Result<Value, String>> {
if matches!(id, "library.inspectLightroom" | "library.importLightroom") {
- let ctx = egui::Context::default();
+ // the app's own context: a fresh one's repaints reach no window and its clock starts at zero
+ let ctx = app.tasks.repaint.clone().unwrap_or_default();
return Some(crate::lightroom_import::command(app, id, p, &ctx));
}
if let Some(language) = language_from_command(id) {
@@ -1205,7 +1206,8 @@ pub fn run_ui_command(app: &mut LightcraftApp, id: &str, p: &Value) -> Option<Re
if kept > 0 {
msg += &crate::i18n::tr_format!("; {kept} already had a location", kept = kept);
}
- app.toast(&egui::Context::default(), msg);
+ let ctx = app.tasks.repaint.clone().unwrap_or_default();
+ app.toast(&ctx, msg);
}
r
}
diff --git a/crates/ui-egui/src/tests_panels.rs b/crates/ui-egui/src/tests_panels.rs
index 592e77716..fd0d81157 100644
--- a/crates/ui-egui/src/tests_panels.rs
+++ b/crates/ui-egui/src/tests_panels.rs
@@ -1113,3 +1113,29 @@ fn a_menu_commands_toast_shows_after_a_while() {
h.step();
assert!(h.app.ui.toast.as_ref().is_some_and(|t| t.0.starts_with("Auto Advance")), "{:?}", h.app.ui.toast);
}
+
+/// Auto-Tag from Tracklog's toast shows too: it was stamped by a clock of its own, which starts at
+/// zero, so a while into a session it had always already expired.
+#[test]
+fn the_tracklog_toast_shows_after_a_while() {
+ let dir = std::env::temp_dir().join(format!("lc-tracklog-toast-{}", std::process::id()));
+ std::fs::create_dir_all(&dir).unwrap();
+ let gpx = dir.join("walk.gpx");
+ std::fs::write(
+ &gpx,
+ r#"<?xml version="1.0"?><gpx version="1.1" creator="test" xmlns="http://www.topografix.com/GPX/1/1"><trk><trkseg><trkpt lat="46.0" lon="7.0"><time>2026-05-01T10:00:00Z</time></trkpt></trkseg></trk></gpx>"#,
+ )
+ .unwrap();
+ let app = LightcraftApp::new(lightcraft_engine::Session::with_demo(), Services { png: None, ..Default::default() });
+ let mut h = crate::headless::Headless::new(app, [1000.0, 700.0], 1.0);
+ for _ in 0..600 {
+ h.step();
+ }
+ let p = serde_json::json!({"command": "photo.tagFromTracklog", "params": {"path": gpx.to_string_lossy(), "offset": 0}});
+ let r = h.request("engine.execute", p, std::time::Duration::from_secs(10));
+ assert_eq!(r["ok"], true, "{r}");
+ h.step();
+ h.step();
+ assert!(h.app.ui.toast.as_ref().is_some_and(|t| t.0.starts_with("Tagged")), "{:?}", h.app.ui.toast);
+ let _ = std::fs::remove_dir_all(&dir);
+}