From e7bd24c13eb0c5c2b8ecf3f09f9e2de315bf8a41 Mon Sep 17 00:00:00 2001 From: memoryruins Date: Thu, 7 Nov 2019 01:03:29 -0500 Subject: use Color's `From` impl in more places --- wgpu/src/renderer/widget/button.rs | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) (limited to 'wgpu/src/renderer/widget/button.rs') diff --git a/wgpu/src/renderer/widget/button.rs b/wgpu/src/renderer/widget/button.rs index ad2186d6..0ac1c0a6 100644 --- a/wgpu/src/renderer/widget/button.rs +++ b/wgpu/src/renderer/widget/button.rs @@ -1,6 +1,6 @@ use crate::{Primitive, Renderer}; use iced_native::{ - button, Align, Background, Button, Color, Layout, Length, MouseCursor, + button, Align, Background, Button, Layout, Length, MouseCursor, Node, Point, Rectangle, Style, }; @@ -53,23 +53,15 @@ impl button::Renderer for Renderer { y: bounds.y + shadow_offset, ..bounds }, - background: Background::Color(Color { - r: 0.0, - b: 0.0, - g: 0.0, - a: 0.5, - }), + background: Background::Color( + [0.0, 0.0, 0.0, 0.5].into(), + ), border_radius: button.border_radius, }, Primitive::Quad { bounds, background: button.background.unwrap_or( - Background::Color(Color { - r: 0.8, - b: 0.8, - g: 0.8, - a: 1.0, - }), + Background::Color([0.8, 0.8, 0.8].into()), ), border_radius: button.border_radius, }, -- cgit