diff --git a/src/color.rs b/src/color.rs index 04c439a6..32759486 100644 --- a/src/color.rs +++ b/src/color.rs @@ -60,8 +60,8 @@ from!(|base: ItemColor|ItemPalette = { light.lightness = (light.lightness * 1.3).min(Okhsl::::max_lightness()); let mut lighter = light; lighter.lightness = (lighter.lightness * 1.3).min(Okhsl::::max_lightness()); - let mut lightest = lighter; - lightest.lightness = (lightest.lightness * 1.3).min(Okhsl::::max_lightness()); + let mut lightest = base.okhsl; + lightest.lightness = 0.95; let mut dark = base.okhsl; dark.lightness = (dark.lightness * 0.75).max(Okhsl::::min_lightness()); @@ -70,7 +70,7 @@ from!(|base: ItemColor|ItemPalette = { darker.lightness = (darker.lightness * 0.66).max(Okhsl::::min_lightness()); darker.saturation = (darker.saturation * 0.66).max(Okhsl::::min_saturation()); let mut darkest = darker; - darkest.lightness = (darkest.lightness * 0.50).max(Okhsl::::min_lightness()); + darkest.lightness = 0.1; darkest.saturation = (darkest.saturation * 0.50).max(Okhsl::::min_saturation()); Self { diff --git a/src/groovebox.rs b/src/groovebox.rs index 23776388..35fe41f4 100644 --- a/src/groovebox.rs +++ b/src/groovebox.rs @@ -132,7 +132,7 @@ render!(Tui: (self: Groovebox) => { Meters(self.sampler.input_meter.as_ref()), GrooveboxSamples(self) ))))); - let status = EditStatus(&self.sampler, &self.editor, note_pt, "test"); + let status = EditStatus(&self.sampler, &self.editor, note_pt, ()); let pool = PoolView(&self.pool); let with_pool = move|x|Bsp::w(Align::e(Fill::y(Fixed::x(pool_w, pool))), x); Fill::xy(Bsp::a(&self.size, diff --git a/src/pool.rs b/src/pool.rs index 45baa1dc..5aa41a9e 100644 --- a/src/pool.rs +++ b/src/pool.rs @@ -217,8 +217,8 @@ render!(Tui: (self: PoolView<'a>) => { let selected = i == self.0.phrase_index(); let offset = |a|Push::y(item_offset, Align::n(Fixed::y(item_height, Fill::x(a)))); offset(Tui::bg(if selected { color.light.rgb } else { color.base.rgb }, lay!( - Align::w(Tui::fg(color.lightest.rgb, format!(" {i:>3} {name}"))), - Align::e(Tui::fg(color.lightest.rgb, format!("{length} "))), + Align::w(Tui::fg(color.lightest.rgb, Tui::bold(selected, format!(" {i:>3} {name}")))), + Align::e(Tui::fg(color.lightest.rgb, Tui::bold(selected, format!("{length} ")))), Align::w(Tui::when(selected, Tui::bold(true, Tui::fg(TuiTheme::g(255), "▶")))), Align::e(Tui::when(selected, Tui::bold(true, Tui::fg(TuiTheme::g(255), "◀")))), )))/* @@ -241,8 +241,8 @@ render!(Tui: (self: PoolView<'a>) => { }), ))))//lay!(clip, Tui::when(i == self.0.clip_index(), CORNERS)))*/ })); - let border = Outer(Style::default().fg(color.base.rgb).bg(color.darker.rgb)); - let enclose = |x|lay!(Fill::xy(border), Tui::bg(color.darkest.rgb, x)); + let border = Outer(Style::default().fg(color.dark.rgb).bg(color.darkest.rgb)); + let enclose = |x|Tui::bg(color.darkest.rgb, lay!(Fill::xy(border), x)); ////let with_files = |x|Tui::either(self.0.file_picker().is_some(), ////Thunk::new(||self.0.file_picker().unwrap()), ////Thunk::new(x));