Skip to content

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

fix: EXIF values under histogram run together (#913)

squareSphere29a33dc70a3c1b
diff --git a/crates/ui-egui/src/panels/edit.rs b/crates/ui-egui/src/panels/edit.rs
index 5567c8beb..7dd0168d8 100644
--- a/crates/ui-egui/src/panels/edit.rs
+++ b/crates/ui-egui/src/panels/edit.rs
@@ -566,21 +566,28 @@ fn histogram(app: &mut LightcraftApp, ui: &mut egui::Ui, id: PhotoId) {
// EXIF strip
if let Some(ph) = app.session.catalog.photo(id) {
let m = &ph.meta;
- let items = [
- m.iso.map(|i| format!("ISO {i}")).unwrap_or_default(),
- m.focal_mm.map(|f| format!("{f:.0}mm")).unwrap_or_default(),
- m.aperture.map(|a| format!("f/{a:.1}")).unwrap_or_default(),
- m.shutter.clone(),
- ];
- let y = r.bottom() - 13.0;
- for (i, s) in items.iter().enumerate() {
- let x = r.left() + 18.0 + (r.width() - 36.0) * i as f32 / 3.0;
- let align = match i {
- 0 => Align2::LEFT_CENTER,
- 3 => Align2::RIGHT_CENTER,
- _ => Align2::CENTER_CENTER,
- };
- p.text(pos2(x, y), align, s, t.font(12.5), t.text_label);
+ let items: Vec<String> = [
+ m.iso.map(|i| format!("ISO {i}")),
+ m.focal_mm.map(|f| format!("{f:.0}mm")),
+ m.aperture.map(|a| format!("f/{a:.1}")),
+ if m.shutter.is_empty() { None } else { Some(m.shutter.clone()) },
+ ]
+ .into_iter()
+ .flatten()
+ .collect();
+
+ if !items.is_empty() {
+ let y = r.bottom() - 13.0;
+ let count = items.len() as f32;
+ for (i, s) in items.iter().enumerate() {
+ let x = r.left() + 18.0 + (r.width() - 36.0) * (i as f32 + 0.5) / count;
+ let align = match i {
+ 0 => Align2::LEFT_CENTER,
+ _ if i == items.len() - 1 => Align2::RIGHT_CENTER,
+ _ => Align2::CENTER_CENTER,
+ };
+ p.text(pos2(x, y), align, s, t.font(12.5), t.text_label);
+ }
}
}
}