diff options
| author | Laurenz <laurmaedje@gmail.com> | 2022-03-11 12:59:55 +0100 |
|---|---|---|
| committer | Laurenz <laurmaedje@gmail.com> | 2022-03-11 23:36:06 +0100 |
| commit | 5ac7eb3860ebd3247f6486c227e816894cb8fd91 (patch) | |
| tree | a29a868c681c7de39f15f2d9d3f031db1861b90a /src/library/graphics | |
| parent | 5ce2a006b6d45d29be15e4562ae3ab4fc1b8e97c (diff) | |
Rename template to content
Diffstat (limited to 'src/library/graphics')
| -rw-r--r-- | src/library/graphics/hide.rs | 4 | ||||
| -rw-r--r-- | src/library/graphics/image.rs | 4 | ||||
| -rw-r--r-- | src/library/graphics/shape.rs | 4 | ||||
| -rw-r--r-- | src/library/graphics/transform.rs | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/library/graphics/hide.rs b/src/library/graphics/hide.rs index 861a1208..21fc58c2 100644 --- a/src/library/graphics/hide.rs +++ b/src/library/graphics/hide.rs @@ -6,8 +6,8 @@ pub struct HideNode(pub LayoutNode); #[class] impl HideNode { - fn construct(_: &mut Context, args: &mut Args) -> TypResult<Template> { - Ok(Template::inline(Self(args.expect("body")?))) + fn construct(_: &mut Context, args: &mut Args) -> TypResult<Content> { + Ok(Content::inline(Self(args.expect("body")?))) } } diff --git a/src/library/graphics/image.rs b/src/library/graphics/image.rs index 66fb8f4b..faf89850 100644 --- a/src/library/graphics/image.rs +++ b/src/library/graphics/image.rs @@ -12,7 +12,7 @@ impl ImageNode { /// How the image should adjust itself to a given area. pub const FIT: ImageFit = ImageFit::Cover; - fn construct(ctx: &mut Context, args: &mut Args) -> TypResult<Template> { + fn construct(ctx: &mut Context, args: &mut Args) -> TypResult<Content> { let path = args.expect::<Spanned<EcoString>>("path to image file")?; let full = ctx.resolve(&path.v); let id = ctx.images.load(&full).map_err(|err| { @@ -25,7 +25,7 @@ impl ImageNode { let width = args.named("width")?; let height = args.named("height")?; - Ok(Template::inline( + Ok(Content::inline( ImageNode(id).pack().sized(Spec::new(width, height)), )) } diff --git a/src/library/graphics/shape.rs b/src/library/graphics/shape.rs index 8b967412..fbe21347 100644 --- a/src/library/graphics/shape.rs +++ b/src/library/graphics/shape.rs @@ -30,7 +30,7 @@ impl<const S: ShapeKind> ShapeNode<S> { /// How much to pad the shape's content. pub const PADDING: Linear = Linear::zero(); - fn construct(_: &mut Context, args: &mut Args) -> TypResult<Template> { + fn construct(_: &mut Context, args: &mut Args) -> TypResult<Content> { let size = match S { SQUARE => args.named::<Length>("size")?.map(Linear::from), CIRCLE => args.named::<Length>("radius")?.map(|r| 2.0 * Linear::from(r)), @@ -47,7 +47,7 @@ impl<const S: ShapeKind> ShapeNode<S> { size => size, }; - Ok(Template::inline( + Ok(Content::inline( Self(args.find()?).pack().sized(Spec::new(width, height)), )) } diff --git a/src/library/graphics/transform.rs b/src/library/graphics/transform.rs index fafb37a4..fcd7528d 100644 --- a/src/library/graphics/transform.rs +++ b/src/library/graphics/transform.rs @@ -24,7 +24,7 @@ impl<const T: TransformKind> TransformNode<T> { /// The origin of the transformation. pub const ORIGIN: Spec<Option<Align>> = Spec::default(); - fn construct(_: &mut Context, args: &mut Args) -> TypResult<Template> { + fn construct(_: &mut Context, args: &mut Args) -> TypResult<Content> { let transform = match T { MOVE => { let tx = args.named("x")?.unwrap_or_default(); @@ -43,7 +43,7 @@ impl<const T: TransformKind> TransformNode<T> { } }; - Ok(Template::inline(Self { + Ok(Content::inline(Self { transform, child: args.expect("body")?, })) |
