From 1bb85556915bb00057ef2ee66a596592c292b15b Mon Sep 17 00:00:00 2001
From: Artur Sapek <me@artur.co>
Date: Thu, 5 Mar 2020 22:05:05 -0700
Subject: implement text support in canvas widget

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

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

diff --git a/wgpu/src/widget/canvas.rs b/wgpu/src/widget/canvas.rs
index 38c1ce62..7d0c5bf3 100644
--- a/wgpu/src/widget/canvas.rs
+++ b/wgpu/src/widget/canvas.rs
@@ -20,6 +20,7 @@ mod drawable;
 mod fill;
 mod frame;
 mod stroke;
+mod text;
 
 pub use drawable::Drawable;
 pub use fill::Fill;
@@ -27,6 +28,7 @@ pub use frame::Frame;
 pub use layer::Layer;
 pub use path::Path;
 pub use stroke::{LineCap, LineJoin, Stroke};
+pub use text::TextNode;
 
 /// A widget capable of drawing 2D graphics.
 ///
@@ -121,10 +123,7 @@ impl<'a, Message> Widget<Message, Renderer> for Canvas<'a> {
                 primitives: self
                     .layers
                     .iter()
-                    .map(|layer| Primitive::Mesh2D {
-                        origin,
-                        buffers: layer.draw(size),
-                    })
+                    .map(|layer| layer.draw(origin, size))
                     .collect(),
             },
             MouseCursor::Idle,
-- 
cgit 


From f35c9f25f03976e058e892662454b1143fd172cd Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Sat, 7 Mar 2020 22:27:02 +0100
Subject: Rename `canvas::TextNode` to `canvas::Text`

---
 wgpu/src/widget/canvas.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/wgpu/src/widget/canvas.rs b/wgpu/src/widget/canvas.rs
index 7d0c5bf3..9741ee9d 100644
--- a/wgpu/src/widget/canvas.rs
+++ b/wgpu/src/widget/canvas.rs
@@ -28,7 +28,7 @@ pub use frame::Frame;
 pub use layer::Layer;
 pub use path::Path;
 pub use stroke::{LineCap, LineJoin, Stroke};
-pub use text::TextNode;
+pub use text::Text;
 
 /// A widget capable of drawing 2D graphics.
 ///
-- 
cgit 


From b74e7e7353d69ffb54cf0c0f0574ea7abf0f3a68 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Sat, 7 Mar 2020 23:45:54 +0100
Subject: Implement `Primitive::Cached`

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

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

diff --git a/wgpu/src/widget/canvas.rs b/wgpu/src/widget/canvas.rs
index 9741ee9d..3a9605c9 100644
--- a/wgpu/src/widget/canvas.rs
+++ b/wgpu/src/widget/canvas.rs
@@ -123,7 +123,10 @@ impl<'a, Message> Widget<Message, Renderer> for Canvas<'a> {
                 primitives: self
                     .layers
                     .iter()
-                    .map(|layer| layer.draw(origin, size))
+                    .map(|layer| Primitive::Cached {
+                        origin,
+                        cache: layer.draw(size),
+                    })
                     .collect(),
             },
             MouseCursor::Idle,
-- 
cgit