diff options
| author |  Héctor Ramón Jiménez <hector0193@gmail.com> | 2020-04-14 06:38:06 +0200 |
|---|---|---|
| committer | Héctor Ramón Jiménez <hector0193@gmail.com> | 2020-04-14 06:38:06 +0200 |
| commit | 81096ef454a9aacacf3853f7dfe96b8b9228f200 (patch) | |
| tree | 26c023761dc306fc9160eb42eef3bcf29b0aa407 | |
| parent | 2a795faf4e3357397298d0c64dcc2c56169906b8 (diff) | |
| download | iced-81096ef454a9aacacf3853f7dfe96b8b9228f200.tar.gz iced-81096ef454a9aacacf3853f7dfe96b8b9228f200.tar.bz2 iced-81096ef454a9aacacf3853f7dfe96b8b9228f200.zip | |
Implement `From<Color>` for `canvas::Fill`
| -rw-r--r-- | examples/clock/src/main.rs | 5 | ||||
| -rw-r--r-- | examples/solar_system/src/main.rs | 16 | ||||
| -rw-r--r-- | wgpu/src/widget/canvas/fill.rs | 6 |
3 files changed, 15 insertions, 12 deletions
diff --git a/examples/clock/src/main.rs b/examples/clock/src/main.rs index a85a964c..1379d3a6 100644 --- a/examples/clock/src/main.rs +++ b/examples/clock/src/main.rs @@ -101,10 +101,7 @@ impl canvas::Drawable for LocalTime { let clock = canvas::Path::new(|path| path.circle(center, radius)); - frame.fill( - &clock, - canvas::Fill::Color(Color::from_rgb8(0x12, 0x93, 0xD8)), - ); + frame.fill(&clock, Color::from_rgb8(0x12, 0x93, 0xD8)); fn draw_hand( n: u32, diff --git a/examples/solar_system/src/main.rs b/examples/solar_system/src/main.rs index 963f047b..d2c6e38f 100644 --- a/examples/solar_system/src/main.rs +++ b/examples/solar_system/src/main.rs @@ -128,7 +128,7 @@ impl State { impl canvas::Drawable for State { fn draw(&self, frame: &mut canvas::Frame) { - use canvas::{Fill, Path, Stroke}; + use canvas::{Path, Stroke}; use std::f32::consts::PI; let center = frame.center(); @@ -146,9 +146,9 @@ impl canvas::Drawable for State { let sun = Path::new(|path| path.circle(center, Self::SUN_RADIUS)); let orbit = Path::new(|path| path.circle(center, Self::ORBIT_RADIUS)); - frame.fill(&space, Fill::Color(Color::BLACK)); - frame.fill(&stars, Fill::Color(Color::WHITE)); - frame.fill(&sun, Fill::Color(Color::from_rgb8(0xF9, 0xD7, 0x1C))); + frame.fill(&space, Color::BLACK); + frame.fill(&stars, Color::WHITE); + frame.fill(&sun, Color::from_rgb8(0xF9, 0xD7, 0x1C)); frame.stroke( &orbit, Stroke { @@ -184,7 +184,7 @@ impl canvas::Drawable for State { ) }); - frame.fill(&earth, Fill::Color(Color::from_rgb8(0x6B, 0x93, 0xD6))); + frame.fill(&earth, Color::from_rgb8(0x6B, 0x93, 0xD6)); frame.with_save(|frame| { frame.rotate( @@ -197,15 +197,15 @@ impl canvas::Drawable for State { path.circle(Point::ORIGIN, Self::MOON_RADIUS) }); - frame.fill(&moon, Fill::Color(Color::WHITE)); + frame.fill(&moon, Color::WHITE); }); frame.fill( &shadow, - Fill::Color(Color { + Color { a: 0.7, ..Color::BLACK - }), + }, ); }); } diff --git a/wgpu/src/widget/canvas/fill.rs b/wgpu/src/widget/canvas/fill.rs index 5ce24cf3..a2010e45 100644 --- a/wgpu/src/widget/canvas/fill.rs +++ b/wgpu/src/widget/canvas/fill.rs @@ -12,3 +12,9 @@ impl Default for Fill { Fill::Color(Color::BLACK) } } + +impl From<Color> for Fill { + fn from(color: Color) -> Fill { + Fill::Color(color) + } +} |