diff options
| author |  Héctor Ramón <hector0193@gmail.com> | 2019-11-07 17:44:27 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2019-11-07 17:44:27 +0100 |
| commit | 59ef7f074c67126dd8bd0ae9cbc82ce2a946258f (patch) | |
| tree | 5004ae812a39d36b3880d340101806edcf6abd04 /wgpu/src/renderer/widget/button.rs | |
| parent | 6790f4b6e36f21b5db9ef02f5e499df8336abfea (diff) | |
| parent | e7bd24c13eb0c5c2b8ecf3f09f9e2de315bf8a41 (diff) | |
| download | iced-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/button.rs')
| -rw-r--r-- | wgpu/src/renderer/widget/button.rs | 18 |
1 files changed, 5 insertions, 13 deletions
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, }, |