summaryrefslogtreecommitdiffstats
path: root/wgpu/src/renderer/widget/scrollable.rs
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón <hector0193@gmail.com>2019-11-07 17:44:27 +0100
committerLibravatar GitHub <noreply@github.com>2019-11-07 17:44:27 +0100
commit59ef7f074c67126dd8bd0ae9cbc82ce2a946258f (patch)
tree5004ae812a39d36b3880d340101806edcf6abd04 /wgpu/src/renderer/widget/scrollable.rs
parent6790f4b6e36f21b5db9ef02f5e499df8336abfea (diff)
parente7bd24c13eb0c5c2b8ecf3f09f9e2de315bf8a41 (diff)
downloadiced-59ef7f074c67126dd8bd0ae9cbc82ce2a946258f.tar.gz
iced-59ef7f074c67126dd8bd0ae9cbc82ce2a946258f.tar.bz2
iced-59ef7f074c67126dd8bd0ae9cbc82ce2a946258f.zip
Merge pull request #46 from memoryruins/from-array
impl From<Array> for Color
Diffstat (limited to 'wgpu/src/renderer/widget/scrollable.rs')
-rw-r--r--wgpu/src/renderer/widget/scrollable.rs18
1 files changed, 5 insertions, 13 deletions
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,
};