Skip to content

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

LRC-DEV-VIEWOPTIONS: switching libraries restarts Show Briefly When Photo Changes

dotCooCoo9fcf7f5b8852
diff --git a/crates/ui-egui/src/panels/settings.rs b/crates/ui-egui/src/panels/settings.rs
index b539358ff..1aee3c0b1 100644
--- a/crates/ui-egui/src/panels/settings.rs
+++ b/crates/ui-egui/src/panels/settings.rs
@@ -1187,6 +1187,7 @@ fn switch_library(app: &mut LightcraftApp, path: &str) -> Result<Value, String>
// or failed switch reopens the same catalog, so its pins stay).
app.ui.reference = None;
app.ui.compare = None;
+ app.ui.brief_info = crate::state::BriefInfo::default();
if app.ui.view == crate::state::ViewMode::Reference {
app.ui.view = crate::state::ViewMode::PhotoGrid;
}
diff --git a/crates/ui-egui/src/tests_switch_library.rs b/crates/ui-egui/src/tests_switch_library.rs
index 2ea310b04..832134f10 100644
--- a/crates/ui-egui/src/tests_switch_library.rs
+++ b/crates/ui-egui/src/tests_switch_library.rs
@@ -75,6 +75,18 @@ fn switching_libraries_dismisses_the_previous_lightroom_result() {
let _ = std::fs::remove_dir_all(dir);
}
+/// Photo IDs are local to a library: the brief info overlay's last photo is forgotten, so a photo
+/// in the new library with the same ID shows the info again.
+#[test]
+fn switching_libraries_restarts_the_brief_info_overlay() {
+ let dir = temp("switch-brief-info");
+ let mut app = app_in(&dir);
+ app.ui.brief_info = crate::state::BriefInfo { photo: Some(lightcraft_catalog::PhotoId(1)), since: 5.0, shown: true };
+ app.run("app.newLibrary", json!({"path": dir.to_string_lossy(), "name": "Second"})).unwrap();
+ assert_eq!(app.ui.brief_info, crate::state::BriefInfo::default());
+ let _ = std::fs::remove_dir_all(dir);
+}
+
fn recent_submenu(app: &LightcraftApp) -> Vec<crate::menubar::MenuNode> {
use crate::menubar::MenuNode;
let bar = crate::menubar::menu_bar(app);