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/scrollable.rs | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) (limited to 'wgpu/src/renderer/widget/scrollable.rs') diff --git a/wgpu/src/renderer/widget/scrollable.rs b/wgpu/src/renderer/widget/scrollable.rs index 360759a5..5eadf275 100644 --- a/wgpu/src/renderer/widget/scrollable.rs +++ b/wgpu/src/renderer/widget/scrollable.rs @@ -1,6 +1,6 @@ use crate::{Primitive, Renderer}; use iced_native::{ - scrollable, Background, Color, Layout, MouseCursor, Point, Rectangle, + scrollable, Background, Layout, MouseCursor, Point, Rectangle, Scrollable, Vector, Widget, }; @@ -78,12 +78,7 @@ impl scrollable::Renderer for Renderer { - f32::from(2 * SCROLLBAR_MARGIN), height: scrollbar_height, }, - background: Background::Color(Color { - r: 0.0, - g: 0.0, - b: 0.0, - a: 0.7, - }), + background: Background::Color([0.0, 0.0, 0.0, 0.7].into()), border_radius: 5, }; @@ -97,12 +92,9 @@ impl scrollable::Renderer for Renderer { - f32::from(2 * SCROLLBAR_MARGIN), ..scrollbar_bounds }, - background: Background::Color(Color { - r: 0.0, - g: 0.0, - b: 0.0, - a: 0.3, - }), + background: Background::Color( + [0.0, 0.0, 0.0, 0.3].into(), + ), border_radius: 5, }; -- cgit