diff options
| author | Laurenz <laurmaedje@gmail.com> | 2022-11-25 10:36:31 +0100 |
|---|---|---|
| committer | Laurenz <laurmaedje@gmail.com> | 2022-11-25 12:16:13 +0100 |
| commit | bf5edbbbbb75120d065d1c9587ccfa4eed4fdca1 (patch) | |
| tree | 956af910ab27a8cec0db83171cd3f0b6d0570a60 /library/src/graphics | |
| parent | 96f72eee6c6b595164c7a0576c407d7a590661db (diff) | |
Tidy up
Diffstat (limited to 'library/src/graphics')
| -rw-r--r-- | library/src/graphics/hide.rs | 4 | ||||
| -rw-r--r-- | library/src/graphics/image.rs | 2 | ||||
| -rw-r--r-- | library/src/graphics/line.rs | 2 | ||||
| -rw-r--r-- | library/src/graphics/shape.rs | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/library/src/graphics/hide.rs b/library/src/graphics/hide.rs index f79b31ae..3a21c2c7 100644 --- a/library/src/graphics/hide.rs +++ b/library/src/graphics/hide.rs @@ -15,10 +15,10 @@ impl LayoutInline for HideNode { fn layout_inline( &self, world: Tracked<dyn World>, - regions: &Regions, styles: StyleChain, + regions: &Regions, ) -> SourceResult<Frame> { - let mut frame = self.0.layout_inline(world, regions, styles)?; + let mut frame = self.0.layout_inline(world, styles, regions)?; frame.clear(); Ok(frame) } diff --git a/library/src/graphics/image.rs b/library/src/graphics/image.rs index 202abebe..de3384df 100644 --- a/library/src/graphics/image.rs +++ b/library/src/graphics/image.rs @@ -41,8 +41,8 @@ impl LayoutInline for ImageNode { fn layout_inline( &self, _: Tracked<dyn World>, - regions: &Regions, styles: StyleChain, + regions: &Regions, ) -> SourceResult<Frame> { let pxw = self.0.width() as f64; let pxh = self.0.height() as f64; diff --git a/library/src/graphics/line.rs b/library/src/graphics/line.rs index e7c347b2..11f0be32 100644 --- a/library/src/graphics/line.rs +++ b/library/src/graphics/line.rs @@ -40,8 +40,8 @@ impl LayoutInline for LineNode { fn layout_inline( &self, _: Tracked<dyn World>, - regions: &Regions, styles: StyleChain, + regions: &Regions, ) -> SourceResult<Frame> { let stroke = styles.get(Self::STROKE).unwrap_or_default(); diff --git a/library/src/graphics/shape.rs b/library/src/graphics/shape.rs index ebdc1717..4c9fec07 100644 --- a/library/src/graphics/shape.rs +++ b/library/src/graphics/shape.rs @@ -76,8 +76,8 @@ impl<const S: ShapeKind> LayoutInline for ShapeNode<S> { fn layout_inline( &self, world: Tracked<dyn World>, - regions: &Regions, styles: StyleChain, + regions: &Regions, ) -> SourceResult<Frame> { let mut frame; if let Some(child) = &self.0 { @@ -90,7 +90,7 @@ impl<const S: ShapeKind> LayoutInline for ShapeNode<S> { let child = child.clone().padded(inset.map(|side| side.map(Length::from))); let mut pod = Regions::one(regions.first, regions.base, regions.expand); - frame = child.layout_inline(world, &pod, styles)?; + frame = child.layout_inline(world, styles, &pod)?; // Relayout with full expansion into square region to make sure // the result is really a square or circle. @@ -106,7 +106,7 @@ impl<const S: ShapeKind> LayoutInline for ShapeNode<S> { pod.first = Size::splat(length); pod.expand = Axes::splat(true); - frame = child.layout_inline(world, &pod, styles)?; + frame = child.layout_inline(world, styles, &pod)?; } } else { // The default size that a shape takes on if it has no child and |
