From 2a795faf4e3357397298d0c64dcc2c56169906b8 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Tue, 14 Apr 2020 06:37:27 +0200
Subject: Make `Frame::fill` take a generic `Into<Fill>`

This can be used to improve readability by using your own types.
---
 wgpu/src/widget/canvas/frame.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'wgpu/src/widget/canvas/frame.rs')

diff --git a/wgpu/src/widget/canvas/frame.rs b/wgpu/src/widget/canvas/frame.rs
index 940be402..f04c6e78 100644
--- a/wgpu/src/widget/canvas/frame.rs
+++ b/wgpu/src/widget/canvas/frame.rs
@@ -89,14 +89,14 @@ impl Frame {
     ///
     /// [`Path`]: path/struct.Path.html
     /// [`Frame`]: struct.Frame.html
-    pub fn fill(&mut self, path: &Path, fill: Fill) {
+    pub fn fill(&mut self, path: &Path, fill: impl Into<Fill>) {
         use lyon::tessellation::{
             BuffersBuilder, FillOptions, FillTessellator,
         };
 
         let mut buffers = BuffersBuilder::new(
             &mut self.buffers,
-            FillVertex(match fill {
+            FillVertex(match fill.into() {
                 Fill::Color(color) => color.into_linear(),
             }),
         );
-- 
cgit 


From dce1034699daee67138a54944c174c0aa5aec9dd Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Tue, 14 Apr 2020 06:39:47 +0200
Subject: Make `Frame::stroke` take a generic `Into<Stroke>`

---
 wgpu/src/widget/canvas/frame.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'wgpu/src/widget/canvas/frame.rs')

diff --git a/wgpu/src/widget/canvas/frame.rs b/wgpu/src/widget/canvas/frame.rs
index f04c6e78..f22d7887 100644
--- a/wgpu/src/widget/canvas/frame.rs
+++ b/wgpu/src/widget/canvas/frame.rs
@@ -127,11 +127,13 @@ impl Frame {
     ///
     /// [`Path`]: path/struct.Path.html
     /// [`Frame`]: struct.Frame.html
-    pub fn stroke(&mut self, path: &Path, stroke: Stroke) {
+    pub fn stroke(&mut self, path: &Path, stroke: impl Into<Stroke>) {
         use lyon::tessellation::{
             BuffersBuilder, StrokeOptions, StrokeTessellator,
         };
 
+        let stroke = stroke.into();
+
         let mut buffers = BuffersBuilder::new(
             &mut self.buffers,
             StrokeVertex(stroke.color.into_linear()),
-- 
cgit 


From 6779fcf62134397671cdb7d3c406262911dcc4c8 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Tue, 14 Apr 2020 06:40:22 +0200
Subject: Make `Frame::fill_text` take a generic `Into<Text>`

---
 wgpu/src/widget/canvas/frame.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'wgpu/src/widget/canvas/frame.rs')

diff --git a/wgpu/src/widget/canvas/frame.rs b/wgpu/src/widget/canvas/frame.rs
index f22d7887..de4717f1 100644
--- a/wgpu/src/widget/canvas/frame.rs
+++ b/wgpu/src/widget/canvas/frame.rs
@@ -175,9 +175,11 @@ impl Frame {
     /// [`Text`]: struct.Text.html
     /// [`Frame`]: struct.Frame.html
     /// [`Canvas`]: struct.Canvas.html
-    pub fn fill_text(&mut self, text: Text) {
+    pub fn fill_text(&mut self, text: impl Into<Text>) {
         use std::f32;
 
+        let text = text.into();
+
         let position = if self.transforms.current.is_identity {
             text.position
         } else {
-- 
cgit