diff --git a/src/theme/text.rs b/src/theme/text.rs index 28d15c1ee..6da11a203 100644 --- a/src/theme/text.rs +++ b/src/theme/text.rs @@ -1,7 +1,8 @@ -use super::Theme; use data::theme::{alpha, randomize_color}; use iced::widget::text::{Appearance, DefaultStyle}; +use super::Theme; + impl DefaultStyle for Theme { fn default_style(&self) -> Appearance { none(self) @@ -49,6 +50,16 @@ pub fn transparent(theme: &Theme) -> Appearance { } pub fn nickname(theme: &Theme, seed: Option, transparent: bool) -> Appearance { + let dark_theme = theme.colors().is_dark_theme(); + + if seed.is_none() { + let mut color = theme.colors().text.base; + if transparent { + color = alpha(color, if dark_theme { 0.2 } else { 0.4 }) + } + return Appearance { color: Some(color) }; + } + let original_color = theme.colors().action.base; let randomized_color = seed .as_deref() @@ -56,7 +67,6 @@ pub fn nickname(theme: &Theme, seed: Option, transparent: bool) -> Appea .unwrap_or_else(|| original_color); let color = if transparent { - let dark_theme = theme.colors().is_dark_theme(); alpha(randomized_color, if dark_theme { 0.2 } else { 0.4 }) } else { randomized_color