diff --git a/tui/src/tui_content/tui_color.rs b/tui/src/tui_content/tui_color.rs index 6fd765c..3a8adf3 100644 --- a/tui/src/tui_content/tui_color.rs +++ b/tui/src/tui_content/tui_color.rs @@ -88,7 +88,7 @@ impl ItemColor { } /// A color in OKHSL and RGB with lighter and darker variants. -#[derive(Debug, Default, Copy, Clone, PartialEq)] pub struct ItemPalette { +#[derive(Debug, Default, Copy, Clone, PartialEq)] pub struct ItemTheme { pub base: ItemColor, pub light: ItemColor, pub lighter: ItemColor, @@ -98,7 +98,7 @@ impl ItemColor { pub darkest: ItemColor, } -impl ItemPalette { +impl ItemTheme { pub const G: [Self;256] = { let mut builder = konst::array::ArrayBuilder::new(); while !builder.is_full() { @@ -109,7 +109,7 @@ impl ItemPalette { let dark = (index as f64 * 0.9) as u8; let darker = (index as f64 * 0.6) as u8; let darkest = (index as f64 * 0.3) as u8; - builder.push(ItemPalette { + builder.push(ItemTheme { base: ItemColor::from_rgb(Color::Rgb(index, index, index )), light: ItemColor::from_rgb(Color::Rgb(light, light, light, )), lighter: ItemColor::from_rgb(Color::Rgb(lighter, lighter, lighter, )), @@ -171,5 +171,5 @@ impl ItemPalette { } } -from!(|base: Color| ItemPalette = Self::from_tui_color(base)); -from!(|base: ItemColor|ItemPalette = Self::from_item_color(base)); +from!(|base: Color| ItemTheme = Self::from_tui_color(base)); +from!(|base: ItemColor|ItemTheme = Self::from_item_color(base)); diff --git a/tui/src/tui_content/tui_field.rs b/tui/src/tui_content/tui_field.rs index 26ae28e..7c83950 100644 --- a/tui/src/tui_content/tui_field.rs +++ b/tui/src/tui_content/tui_field.rs @@ -1,9 +1,9 @@ use crate::*; -pub struct FieldH(pub ItemPalette, pub T, pub U); +pub struct FieldH(pub ItemTheme, pub T, pub U); impl, U: Content> Content for FieldH { fn content (&self) -> impl Render { - let Self(ItemPalette { darkest, dark, lighter, lightest, .. }, title, value) = self; + let Self(ItemTheme { darkest, dark, lighter, lightest, .. }, title, value) = self; row!( Tui::fg_bg(dark.rgb, darkest.rgb, "▐"), Tui::fg_bg(lighter.rgb, dark.rgb, Tui::bold(true, title)), @@ -13,10 +13,10 @@ impl, U: Content> Content for FieldH { } } -pub struct FieldV(pub ItemPalette, pub T, pub U); +pub struct FieldV(pub ItemTheme, pub T, pub U); impl, U: Content> Content for FieldV { fn content (&self) -> impl Render { - let Self(ItemPalette { darkest, dark, lighter, lightest, .. }, title, value) = self; + let Self(ItemTheme { darkest, dark, lighter, lightest, .. }, title, value) = self; let sep1 = Tui::bg(darkest.rgb, Tui::fg(dark.rgb, "▐")); let sep2 = Tui::bg(darkest.rgb, Tui::fg(dark.rgb, "▌")); let title = Tui::bg(dark.rgb, Tui::fg(lighter.rgb, Tui::bold(true, title)));