Skip to content

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

Drop the sign from slider text that rounds to zero

NetterSilver0474ea9e1bb2
diff --git a/crates/develop/src/controls.rs b/crates/develop/src/controls.rs
index 715e8ac33..f58cb17bb 100644
--- a/crates/develop/src/controls.rs
+++ b/crates/develop/src/controls.rs
@@ -97,6 +97,10 @@ impl ControlSpec {
}
pub fn format(&self, v: f64) -> String {
let s = format!("{:.*}", self.decimals as usize, v);
+ if v.is_finite() && !s.bytes().any(|b| matches!(b, b'1'..=b'9')) {
+ // Rounds to zero: no sign.
+ return s.trim_start_matches('-').to_string();
+ }
if v > 0.0 && self.min < 0.0 { format!("+{s}") } else { s }
}
/// Where `v` sits on the slider track, from 0 (left end) to 1 (right end). Linear, except for the Kelvin
@@ -493,6 +497,17 @@ pub fn in_section(section: Section) -> impl Iterator<Item = &'static ControlSpec
mod tests {
use super::*;
+ #[test]
+ fn format_shows_no_sign_on_a_value_that_rounds_to_zero() {
+ let e = find("light.exposure").unwrap();
+ assert_eq!(e.format(0.004), "0.00");
+ assert_eq!(e.format(-0.004), "0.00");
+ assert_eq!(e.format(0.5), "+0.50");
+ assert_eq!(e.format(-0.5), "-0.50");
+ assert_eq!(e.format(f64::INFINITY), "+inf");
+ assert_eq!(e.format(f64::NEG_INFINITY), "-inf");
+ }
+
#[test]
fn every_control_reads_its_default() {
let s = DevelopSettings::default();