diff --git a/wgui/src/components/button.rs b/wgui/src/components/button.rs index b782c280..b929d1b6 100644 --- a/wgui/src/components/button.rs +++ b/wgui/src/components/button.rs @@ -428,29 +428,19 @@ pub fn construct(ess: &mut ConstructEssentials, params: Params) -> anyhow::Resul style.overflow.y = taffy::Overflow::Hidden; // update colors to default ones if they are not specified - let color = if let Some(color) = params.color { - color - } else { - theme.button_color - }; + let color = params.color.unwrap_or(theme.button_color); - let border_color = if let Some(border_color) = params.border_color { - border_color - } else { - Color::new(color.r, color.g, color.b, color.a + 0.25) - }; + let border_color = params + .border_color + .unwrap_or_else(|| Color::new(color.r, color.g, color.b, color.a + 0.25)); - let hover_color = if let Some(hover_color) = params.hover_color { - hover_color - } else { - Color::new(color.r + 0.25, color.g + 0.25, color.g + 0.25, color.a + 0.15) - }; + let hover_color = params + .hover_color + .unwrap_or_else(|| Color::new(color.r + 0.25, color.g + 0.25, color.g + 0.25, color.a + 0.15)); - let hover_border_color = if let Some(hover_border_color) = params.hover_border_color { - hover_border_color - } else { - Color::new(color.r + 0.5, color.g + 0.5, color.g + 0.5, color.a + 0.5) - }; + let hover_border_color = params + .hover_border_color + .unwrap_or_else(|| Color::new(color.r + 0.5, color.g + 0.5, color.g + 0.5, color.a + 0.5)); let gradient_intensity = theme.gradient_intensity;