LightCraft: An open-source non-destructive photo editor written by scratch in pure Rust
Merge fixes: #333 hover label id, #346's test boxes the import dialog (#325), unused mut
Claudedc67d348e643
diff --git a/crates/ui-egui/src/headless.rs b/crates/ui-egui/src/headless.rsindex e6e790000..b04759d4b 100644--- a/crates/ui-egui/src/headless.rs+++ b/crates/ui-egui/src/headless.rs@@ -1437,7 +1437,7 @@ mod tests {..Default::default()}).collect();- h.app.ui.dialog = Some(crate::state::Dialog::Import { opts: crate::import::ImportDialog::new(candidates) });+ h.app.ui.dialog = Some(crate::state::Dialog::Import { opts: Box::new(crate::import::ImportDialog::new(candidates)) });let rect = |h: &mut Headless| {let r = h.request("ui.widgets", json!({}), t);let w = r["result"].as_array().and_then(|a| a.iter().find(|w| w["id"] == "dialog:window")).expect("dialog on screen");diff --git a/crates/ui-egui/src/panels/edit.rs b/crates/ui-egui/src/panels/edit.rsindex cd2aae461..a81782685 100644--- a/crates/ui-egui/src/panels/edit.rs+++ b/crates/ui-egui/src/panels/edit.rs@@ -351,7 +351,7 @@ fn profile_menu(app: &mut LightcraftApp, ui: &mut egui::Ui, d: &DevelopSettings)let cur = d.profile.id.as_str();// (clicked, hovered)let mut pick: (Option<String>, Option<String>) = (None, None);- let mut item = |ui: &mut egui::Ui, key: &str, id: &str, name: &str, pick: &mut (Option<String>, Option<String>)| {+ let item = |ui: &mut egui::Ui, key: &str, id: &str, name: &str, pick: &mut (Option<String>, Option<String>)| {let r = ui.selectable_label(id == cur, crate::i18n::profile_label(id, name));register(ui.ctx(), format!("profileMenu:{key}:{id}"), r.rect);if r.clicked() {diff --git a/crates/ui-egui/src/panels/profiles.rs b/crates/ui-egui/src/panels/profiles.rsindex c5045b740..67218937c 100644--- a/crates/ui-egui/src/panels/profiles.rs+++ b/crates/ui-egui/src/panels/profiles.rs@@ -123,7 +123,7 @@ pub fn show(app: &mut LightcraftApp, ui: &mut egui::Ui, id: PhotoId) {{let s = with_profile_id(&d, &saved_profile_id);app.hover_preview =- Some(HoverPreview { label: crate::i18n::tr_format!("Profile: {}", crate::i18n::profile_label(p_id, p_name)), settings: s });+ Some(HoverPreview { label: crate::i18n::tr_format!("Profile: {}", crate::i18n::profile_label(&saved_profile_id, p_name)), settings: s });}} else {ui.data_mut(|m| m.remove::<(PhotoId, String)>(last_hover_id));