From 26619bf4640cb1626a459fc813f949348a21ce91 Mon Sep 17 00:00:00 2001 From: Rubens Brandao Date: Sat, 11 May 2024 07:48:07 -0300 Subject: [PATCH] Add alpha to HighlightColor::NoHighlightColor --- rust/src/types.rs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/rust/src/types.rs b/rust/src/types.rs index 44bc71f98..7927b0c12 100644 --- a/rust/src/types.rs +++ b/rust/src/types.rs @@ -3375,7 +3375,9 @@ impl HighlightStandardColor { #[derive(Debug, Copy, Clone)] pub enum HighlightColor { - NoHighlightColor, + NoHighlightColor { + alpha: u8, + }, StandardHighlightColor { color: HighlightStandardColor, alpha: u8, @@ -3403,7 +3405,7 @@ impl HighlightColor { HIGHLIGHT_COLOR => { let Some(color) = HighlightStandardColor::from_raw(raw.color) else { // StandardHighlightColor with NoHighlightColor, is no color - return Self::NoHighlightColor; + return Self::NoHighlightColor { alpha: raw.alpha }; }; Self::StandardHighlightColor { color, @@ -3431,16 +3433,17 @@ impl HighlightColor { alpha: raw.alpha, }, // other color style is just no color - _ => Self::NoHighlightColor, + _ => Self::NoHighlightColor { alpha: u8::MAX }, } } pub fn into_raw(self) -> BNHighlightColor { let zeroed: BNHighlightColor = unsafe { core::mem::zeroed() }; match self { - Self::NoHighlightColor => BNHighlightColor { + Self::NoHighlightColor { alpha } => BNHighlightColor { style: BNHighlightColorStyle::StandardHighlightColor, color: BNHighlightStandardColor::NoHighlightColor, + alpha, ..zeroed }, Self::StandardHighlightColor { color, alpha } => BNHighlightColor {