summaryrefslogtreecommitdiffstats
path: root/wgpu/src/widget/canvas.rs
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón <hector0193@gmail.com>2020-03-09 00:48:51 +0100
committerLibravatar GitHub <noreply@github.com>2020-03-09 00:48:51 +0100
commit5a91b52ef4066701d82a897b44a3f90412f210d2 (patch)
tree13d58d144c3ddf05e44c72557bf2af2194207bf3 /wgpu/src/widget/canvas.rs
parent29219500b7144f31dbf50fcc64653f7d2ce806d0 (diff)
parentb4f970ee7317297615848cd12f422c0cd2889f60 (diff)
downloadiced-5a91b52ef4066701d82a897b44a3f90412f210d2.tar.gz
iced-5a91b52ef4066701d82a897b44a3f90412f210d2.tar.bz2
iced-5a91b52ef4066701d82a897b44a3f90412f210d2.zip
Merge pull request #214 from artursapek/artur/canvas-text
Implement text support in canvas widget
Diffstat (limited to 'wgpu/src/widget/canvas.rs')
-rw-r--r--wgpu/src/widget/canvas.rs6
1 files changed, 4 insertions, 2 deletions
diff --git a/wgpu/src/widget/canvas.rs b/wgpu/src/widget/canvas.rs
index 38c1ce62..3a9605c9 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::Text;
/// A widget capable of drawing 2D graphics.
///
@@ -121,9 +123,9 @@ impl<'a, Message> Widget<Message, Renderer> for Canvas<'a> {
primitives: self
.layers
.iter()
- .map(|layer| Primitive::Mesh2D {
+ .map(|layer| Primitive::Cached {
origin,
- buffers: layer.draw(size),
+ cache: layer.draw(size),
})
.collect(),
},