me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

use Color's From impl in more places

Browse source
This commit is contained in:
memoryruins 2019-11-07 01:03:29 -05:00
parent 58bd0824bf
commit e7bd24c13e
7 changed files with 49 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

18
wgpu/src/renderer/widget/button.rs
View file

@ -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,
},