Rename canvas::TextNode to canvas::Text

This commit is contained in:
Héctor Ramón Jiménez 2020-03-07 22:27:02 +01:00
parent 1bb8555691
commit f35c9f25f0
3 changed files with 11 additions and 9 deletions

View File

@ -28,7 +28,7 @@ pub use frame::Frame;
pub use layer::Layer; pub use layer::Layer;
pub use path::Path; pub use path::Path;
pub use stroke::{LineCap, LineJoin, Stroke}; pub use stroke::{LineCap, LineJoin, Stroke};
pub use text::TextNode; pub use text::Text;
/// A widget capable of drawing 2D graphics. /// A widget capable of drawing 2D graphics.
/// ///

View File

@ -1,7 +1,7 @@
use iced_native::{Point, Size, Vector}; use iced_native::{Point, Size, Vector};
use crate::{ use crate::{
canvas::{Fill, Path, Stroke, TextNode}, canvas::{Fill, Path, Stroke, Text},
triangle, Primitive, triangle, Primitive,
}; };
@ -16,7 +16,7 @@ pub struct Frame {
height: f32, height: f32,
buffers: lyon::tessellation::VertexBuffers<triangle::Vertex2D, u32>, buffers: lyon::tessellation::VertexBuffers<triangle::Vertex2D, u32>,
transforms: Transforms, transforms: Transforms,
texts: Vec<TextNode>, texts: Vec<Text>,
} }
#[derive(Debug)] #[derive(Debug)]
@ -158,11 +158,11 @@ impl Frame {
let _ = result.expect("Stroke path"); let _ = result.expect("Stroke path");
} }
/// Draws the text of the given [`TextNode`] on the [`Frame`] /// Draws the text of the given [`Text`] on the [`Frame`]
/// ///
/// [`TextNode`]: struct.TextNode.html /// [`Text`]: struct.Text.html
/// [`Frame`]: struct.Frame.html /// [`Frame`]: struct.Frame.html
pub fn text(&mut self, text: TextNode) { pub fn text(&mut self, text: Text) {
self.texts.push(text); self.texts.push(text);
} }

View File

@ -1,8 +1,10 @@
use iced_native::{Color, Font, HorizontalAlignment, Rectangle, VerticalAlignment}; use iced_native::{
Color, Font, HorizontalAlignment, Rectangle, VerticalAlignment,
};
/// A text node to be drawn to a canvas /// A bunch of text that can be drawn to a canvas
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct TextNode { pub struct Text {
/// The contents of the text /// The contents of the text
pub content: String, pub content: String,
/// The bounds of the text /// The bounds of the text