diff --git a/crates/tek_core/src/color.rs b/crates/tek_core/src/color.rs index edf8a176..f4d76061 100644 --- a/crates/tek_core/src/color.rs +++ b/crates/tek_core/src/color.rs @@ -26,7 +26,7 @@ impl From for ItemColor { impl ItemColor { pub fn random () -> Self { let mut rng = thread_rng(); - let lo = Okhsl::new(-180.0, 0.01, 0.2); + let lo = Okhsl::new(-180.0, 0.01, 0.25); let hi = Okhsl::new( 180.0, 0.9, 0.5); UniformOkhsl::new(lo, hi).sample(&mut rng).into() } @@ -46,12 +46,10 @@ impl ItemColor { } impl From for ItemColorTriplet { fn from (base: ItemColor) -> Self { - let mut light = base.okhsl.clone(); - light.saturation = (light.saturation * 0.9).max(Okhsl::::min_saturation()); - light.lightness = (light.lightness * 1.1).min(Okhsl::::max_saturation()); - let mut dark = base.okhsl.clone(); - dark.saturation = (dark.saturation * 1.1).min(Okhsl::::max_saturation()); - dark.lightness = (dark.lightness * 0.9).max(Okhsl::::min_saturation()); + let mut light = base.okhsl.clone(); + light.lightness = (light.lightness * 1.15).min(Okhsl::::max_saturation()); + let mut dark = base.okhsl.clone(); + dark.lightness = (dark.lightness * 0.85).max(Okhsl::::min_saturation()); Self { base, light: light.into(), dark: dark.into() } } } diff --git a/crates/tek_sequencer/src/sequencer_tui.rs b/crates/tek_sequencer/src/sequencer_tui.rs index 9edbc9ce..7e37b70a 100644 --- a/crates/tek_sequencer/src/sequencer_tui.rs +++ b/crates/tek_sequencer/src/sequencer_tui.rs @@ -32,8 +32,7 @@ impl Content for PhrasePool { if *focused && i == *phrase { row2 = format!("{row2}▄"); } }; let row2 = TuiStyle::bold(row2, true); - let bg = if i == self.phrase { color.base } else { color.light }; - add(&col!(row1, row2).fill_x().bg(bg.rgb))?; + add(&col!(row1, row2).fill_x().bg(color.base.rgb))?; Ok(if *focused && i == self.phrase { add(&CORNERS)?; }) }) );