diff --git a/dizzle b/dizzle index 909b94c..a06838f 160000 --- a/dizzle +++ b/dizzle @@ -1 +1 @@ -Subproject commit 909b94cbd4beffb49be314724dc79db9374bcc99 +Subproject commit a06838f22a400a296c92db8c9cec18b8c3ec5e1f diff --git a/src/tengri_impl.rs b/src/tengri_impl.rs index c20d9b4..177630c 100644 --- a/src/tengri_impl.rs +++ b/src/tengri_impl.rs @@ -868,11 +868,11 @@ mod xywh { use unicode_width::{UnicodeWidthStr, UnicodeWidthChar}; use rand::distributions::uniform::UniformSampler; impl Coord for u16 { fn plus (self, other: Self) -> Self { self.saturating_add(other) } } - from!(BigBuffer: |size:(usize, usize)| Self::new(size.0, size.1)); - from!(ItemTheme: |base: ItemColor| Self::from_item_color(base)); - from!(ItemTheme: |base: Color| Self::from_tui_color(base)); - from!(ItemColor: |rgb: Color| Self { rgb, okhsl: rgb_to_okhsl(rgb) }); - from!(ItemColor: |okhsl: Okhsl| Self { okhsl, rgb: okhsl_to_rgb(okhsl) }); + impl_from!(BigBuffer: |size:(usize, usize)| Self::new(size.0, size.1)); + impl_from!(ItemTheme: |base: ItemColor| Self::from_item_color(base)); + impl_from!(ItemTheme: |base: Color| Self::from_tui_color(base)); + impl_from!(ItemColor: |rgb: Color| Self { rgb, okhsl: rgb_to_okhsl(rgb) }); + impl_from!(ItemColor: |okhsl: Okhsl| Self { okhsl, rgb: okhsl_to_rgb(okhsl) }); impl_debug!(BigBuffer |self, f| { write!(f, "[BB {}x{} ({})]", self.width, self.height, self.content.len()) }); impl Tui { pub fn new (output: Box) -> Usually {