unspeaker/tek
1
0
Fork 0
mirror of https://codeberg.org/unspeaker/tek.git synced 2025-12-07 12:16:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

don't alter saturation

Browse source
This commit is contained in:
🪞👃🪞 2024-11-02 15:20:49 +02:00
parent 87379ff76b
commit bab0235c20
2 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/tek_core/src/color.rs
View file

@ -26,7 +26,7 @@ impl From<Color> for ItemColor {
impl ItemColor { impl ItemColor {
pub fn random () -> Self { pub fn random () -> Self {
let mut rng = thread_rng(); 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); let hi = Okhsl::new( 180.0, 0.9, 0.5);
UniformOkhsl::new(lo, hi).sample(&mut rng).into() UniformOkhsl::new(lo, hi).sample(&mut rng).into()
} }
@ -46,12 +46,10 @@ impl ItemColor {
} }
impl From<ItemColor> for ItemColorTriplet { impl From<ItemColor> for ItemColorTriplet {
fn from (base: ItemColor) -> Self { fn from (base: ItemColor) -> Self {
let mut light = base.okhsl.clone(); let mut light = base.okhsl.clone();
light.saturation = (light.saturation * 0.9).max(Okhsl::<f32>::min_saturation()); light.lightness = (light.lightness * 1.15).min(Okhsl::<f32>::max_saturation());
light.lightness = (light.lightness * 1.1).min(Okhsl::<f32>::max_saturation()); let mut dark = base.okhsl.clone();
let mut dark = base.okhsl.clone(); dark.lightness = (dark.lightness * 0.85).max(Okhsl::<f32>::min_saturation());
dark.saturation = (dark.saturation * 1.1).min(Okhsl::<f32>::max_saturation());
dark.lightness = (dark.lightness * 0.9).max(Okhsl::<f32>::min_saturation());
Self { base, light: light.into(), dark: dark.into() } Self { base, light: light.into(), dark: dark.into() }
} }
} }

3
crates/tek_sequencer/src/sequencer_tui.rs
View file

@ -32,8 +32,7 @@ impl Content for PhrasePool<Tui> {
if *focused && i == *phrase { row2 = format!("{row2}▄"); } if *focused && i == *phrase { row2 = format!("{row2}▄"); }
}; };
let row2 = TuiStyle::bold(row2, true); let row2 = TuiStyle::bold(row2, true);
let bg = if i == self.phrase { color.base } else { color.light }; add(&col!(row1, row2).fill_x().bg(color.base.rgb))?;
add(&col!(row1, row2).fill_x().bg(bg.rgb))?;
Ok(if *focused && i == self.phrase { add(&CORNERS)?; }) Ok(if *focused && i == self.phrase { add(&CORNERS)?; })
}) })
); );