diff options
author | 2020-03-10 06:12:06 +0100 | |
---|---|---|
committer | 2020-03-10 06:12:06 +0100 | |
commit | e4fbca59b4b9478c9c5fa5eec9ebe31dc93412ad (patch) | |
tree | 237d2e5dd29c2d0f05f2b68f829425bb480b8ce7 /wgpu/src/widget/canvas.rs | |
parent | 6151c528241d0a6ece88e6e664df1b50f8174ecb (diff) | |
parent | 5a91b52ef4066701d82a897b44a3f90412f210d2 (diff) | |
download | iced-e4fbca59b4b9478c9c5fa5eec9ebe31dc93412ad.tar.gz iced-e4fbca59b4b9478c9c5fa5eec9ebe31dc93412ad.tar.bz2 iced-e4fbca59b4b9478c9c5fa5eec9ebe31dc93412ad.zip |
Merge branch 'master' into feature/panes-widget
Diffstat (limited to 'wgpu/src/widget/canvas.rs')
-rw-r--r-- | wgpu/src/widget/canvas.rs | 6 |
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(), }, |