diff options
| -rw-r--r-- | graphics/src/widget/canvas/frame.rs | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/graphics/src/widget/canvas/frame.rs b/graphics/src/widget/canvas/frame.rs index df2db98f..8845bc6a 100644 --- a/graphics/src/widget/canvas/frame.rs +++ b/graphics/src/widget/canvas/frame.rs @@ -3,11 +3,11 @@ use std::borrow::Cow; use iced_native::{Point, Rectangle, Size, Vector}; use crate::triangle; -use crate::widget::canvas::{Fill, Geometry, Path, Stroke, Text, path}; +use crate::widget::canvas::{path, Fill, Geometry, Path, Stroke, Text}; use crate::Primitive; -use crate::triangle::{Vertex2D}; use crate::shader::Shader; +use crate::triangle::Vertex2D; use lyon::tessellation; use lyon::tessellation::geometry_builder::Positions; @@ -208,8 +208,6 @@ impl Frame { /// /// [`Canvas`]: crate::widget::Canvas pub fn fill_text(&mut self, text: impl Into<Text>) { - use std::f32; - let text = text.into(); let position = if self.transforms.current.is_identity { @@ -333,15 +331,15 @@ impl Frame { } fn into_primitives(mut self) -> Vec<Primitive> { - if !self.primitives.is_empty() { - for (buffer, shader) in self.buffers { + for (buffer, shader) in self.buffers { + if !buffer.indices.is_empty() { self.primitives.push(Primitive::Mesh2D { buffers: triangle::Mesh2D { vertices: Vertex2D::from(buffer.vertices), - indices: buffer.indices + indices: buffer.indices, }, size: self.size, - shader + shader, }) } } |