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/layer/cache.rs | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

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

diff --git a/wgpu/src/widget/canvas/layer/cache.rs b/wgpu/src/widget/canvas/layer/cache.rs
index 3071cce0..f05028da 100644
--- a/wgpu/src/widget/canvas/layer/cache.rs
+++ b/wgpu/src/widget/canvas/layer/cache.rs
@@ -1,12 +1,10 @@
 use crate::{
     canvas::{Drawable, Frame, Layer},
-    triangle,
+    Primitive,
 };
 
-use iced_native::Size;
-use std::cell::RefCell;
-use std::marker::PhantomData;
-use std::sync::Arc;
+use iced_native::{Point, Size};
+use std::{cell::RefCell, marker::PhantomData};
 
 /// A simple cache that stores generated geometry to avoid recomputation.
 ///
@@ -24,10 +22,7 @@ pub struct Cache<T: Drawable> {
 #[derive(Debug)]
 enum State {
     Empty,
-    Filled {
-        mesh: Arc<triangle::Mesh2D>,
-        bounds: Size,
-    },
+    Filled { bounds: Size, primitive: Primitive },
 }
 
 impl<T> Cache<T>
@@ -75,27 +70,27 @@ impl<'a, T> Layer for Bind<'a, T>
 where
     T: Drawable + std::fmt::Debug,
 {
-    fn draw(&self, current_bounds: Size) -> Arc<triangle::Mesh2D> {
+    fn draw(&self, origin: Point, current_bounds: Size) -> Primitive {
         use std::ops::Deref;
 
-        if let State::Filled { mesh, bounds } =
+        if let State::Filled { bounds, primitive } =
             self.cache.state.borrow().deref()
         {
             if *bounds == current_bounds {
-                return mesh.clone();
+                return primitive.clone();
             }
         }
 
         let mut frame = Frame::new(current_bounds.width, current_bounds.height);
         self.input.draw(&mut frame);
 
-        let mesh = Arc::new(frame.into_mesh());
+        let primitive = frame.into_primitive(origin);
 
         *self.cache.state.borrow_mut() = State::Filled {
-            mesh: mesh.clone(),
             bounds: current_bounds,
+            primitive: primitive.clone(),
         };
 
-        mesh
+        primitive
     }
 }
-- 
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/layer/cache.rs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

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

diff --git a/wgpu/src/widget/canvas/layer/cache.rs b/wgpu/src/widget/canvas/layer/cache.rs
index f05028da..6b69f01e 100644
--- a/wgpu/src/widget/canvas/layer/cache.rs
+++ b/wgpu/src/widget/canvas/layer/cache.rs
@@ -3,8 +3,8 @@ use crate::{
     Primitive,
 };
 
-use iced_native::{Point, Size};
-use std::{cell::RefCell, marker::PhantomData};
+use iced_native::Size;
+use std::{cell::RefCell, marker::PhantomData, sync::Arc};
 
 /// A simple cache that stores generated geometry to avoid recomputation.
 ///
@@ -22,7 +22,10 @@ pub struct Cache<T: Drawable> {
 #[derive(Debug)]
 enum State {
     Empty,
-    Filled { bounds: Size, primitive: Primitive },
+    Filled {
+        bounds: Size,
+        primitive: Arc<Primitive>,
+    },
 }
 
 impl<T> Cache<T>
@@ -70,7 +73,7 @@ impl<'a, T> Layer for Bind<'a, T>
 where
     T: Drawable + std::fmt::Debug,
 {
-    fn draw(&self, origin: Point, current_bounds: Size) -> Primitive {
+    fn draw(&self, current_bounds: Size) -> Arc<Primitive> {
         use std::ops::Deref;
 
         if let State::Filled { bounds, primitive } =
@@ -84,7 +87,7 @@ where
         let mut frame = Frame::new(current_bounds.width, current_bounds.height);
         self.input.draw(&mut frame);
 
-        let primitive = frame.into_primitive(origin);
+        let primitive = Arc::new(frame.into_primitive());
 
         *self.cache.state.borrow_mut() = State::Filled {
             bounds: current_bounds,
-- 
cgit