From de8f06b512ec65f625417e334dca30990248c968 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Wed, 12 Feb 2020 09:12:35 +0100
Subject: Split `Fill` and `Stroke` into their own modules

---
 wgpu/src/widget/canvas/stroke.rs | 66 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 wgpu/src/widget/canvas/stroke.rs

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

diff --git a/wgpu/src/widget/canvas/stroke.rs b/wgpu/src/widget/canvas/stroke.rs
new file mode 100644
index 00000000..9bb260b2
--- /dev/null
+++ b/wgpu/src/widget/canvas/stroke.rs
@@ -0,0 +1,66 @@
+use iced_native::Color;
+
+#[derive(Debug, Clone, Copy)]
+pub struct Stroke {
+    pub color: Color,
+    pub width: f32,
+    pub line_cap: LineCap,
+    pub line_join: LineJoin,
+}
+
+impl Default for Stroke {
+    fn default() -> Stroke {
+        Stroke {
+            color: Color::BLACK,
+            width: 1.0,
+            line_cap: LineCap::default(),
+            line_join: LineJoin::default(),
+        }
+    }
+}
+
+#[derive(Debug, Clone, Copy)]
+pub enum LineCap {
+    Butt,
+    Square,
+    Round,
+}
+
+impl Default for LineCap {
+    fn default() -> LineCap {
+        LineCap::Butt
+    }
+}
+
+impl From<LineCap> for lyon::tessellation::LineCap {
+    fn from(line_cap: LineCap) -> lyon::tessellation::LineCap {
+        match line_cap {
+            LineCap::Butt => lyon::tessellation::LineCap::Butt,
+            LineCap::Square => lyon::tessellation::LineCap::Square,
+            LineCap::Round => lyon::tessellation::LineCap::Round,
+        }
+    }
+}
+
+#[derive(Debug, Clone, Copy)]
+pub enum LineJoin {
+    Miter,
+    Round,
+    Bevel,
+}
+
+impl Default for LineJoin {
+    fn default() -> LineJoin {
+        LineJoin::Miter
+    }
+}
+
+impl From<LineJoin> for lyon::tessellation::LineJoin {
+    fn from(line_join: LineJoin) -> lyon::tessellation::LineJoin {
+        match line_join {
+            LineJoin::Miter => lyon::tessellation::LineJoin::Miter,
+            LineJoin::Round => lyon::tessellation::LineJoin::Round,
+            LineJoin::Bevel => lyon::tessellation::LineJoin::Bevel,
+        }
+    }
+}
-- 
cgit 


From 9c067562fa765cfc49d09cd9b12fbba96d5619fa Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Tue, 18 Feb 2020 08:48:54 +0100
Subject: Write documentation for new `canvas` module

---
 wgpu/src/widget/canvas/stroke.rs | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

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

diff --git a/wgpu/src/widget/canvas/stroke.rs b/wgpu/src/widget/canvas/stroke.rs
index 9bb260b2..46d669c4 100644
--- a/wgpu/src/widget/canvas/stroke.rs
+++ b/wgpu/src/widget/canvas/stroke.rs
@@ -1,10 +1,16 @@
 use iced_native::Color;
 
+/// The style of a stroke.
 #[derive(Debug, Clone, Copy)]
 pub struct Stroke {
+    /// The color of the stroke.
     pub color: Color,
+    /// The distance between the two edges of the stroke.
     pub width: f32,
+    /// The shape to be used at the end of open subpaths when they are stroked.
     pub line_cap: LineCap,
+    /// The shape to be used at the corners of paths or basic shapes when they
+    /// are stroked.
     pub line_join: LineJoin,
 }
 
@@ -19,10 +25,16 @@ impl Default for Stroke {
     }
 }
 
+/// The shape used at the end of open subpaths when they are stroked.
 #[derive(Debug, Clone, Copy)]
 pub enum LineCap {
+    /// The stroke for each sub-path does not extend beyond its two endpoints.
     Butt,
+    /// At the end of each sub-path, the shape representing the stroke will be
+    /// extended by a square.
     Square,
+    /// At the end of each sub-path, the shape representing the stroke will be
+    /// extended by a semicircle.
     Round,
 }
 
@@ -42,10 +54,15 @@ impl From<LineCap> for lyon::tessellation::LineCap {
     }
 }
 
+/// The shape used at the corners of paths or basic shapes when they are
+/// stroked.
 #[derive(Debug, Clone, Copy)]
 pub enum LineJoin {
+    /// A sharp corner.
     Miter,
+    /// A round corner.
     Round,
+    /// A bevelled corner.
     Bevel,
 }
 
-- 
cgit