summaryrefslogtreecommitdiff
path: root/src/library/graphics
diff options
context:
space:
mode:
authorLaurenz <laurmaedje@gmail.com>2022-06-12 17:16:14 +0200
committerLaurenz <laurmaedje@gmail.com>2022-06-12 17:26:18 +0200
commit6e3b1a2c80428d581d00b9d65e1c45401df2e210 (patch)
tree34d4b1c200851aa77af66b737bfe445e2da11f44 /src/library/graphics
parented6550fdb08eae92bffab6b6b137b1e0eebf62c6 (diff)
Make all fields of `Frame` private
Diffstat (limited to 'src/library/graphics')
-rw-r--r--src/library/graphics/hide.rs6
-rw-r--r--src/library/graphics/shape.rs6
-rw-r--r--src/library/graphics/transform.rs4
3 files changed, 6 insertions, 10 deletions
diff --git a/src/library/graphics/hide.rs b/src/library/graphics/hide.rs
index 4ba5e023..c969ef76 100644
--- a/src/library/graphics/hide.rs
+++ b/src/library/graphics/hide.rs
@@ -22,11 +22,7 @@ impl Layout for HideNode {
// Clear the frames.
for frame in &mut frames {
- *frame = Arc::new({
- let mut empty = Frame::new(frame.size);
- empty.baseline = frame.baseline;
- empty
- });
+ Arc::make_mut(frame).clear();
}
Ok(frames)
diff --git a/src/library/graphics/shape.rs b/src/library/graphics/shape.rs
index 82eb2d9d..6c315c24 100644
--- a/src/library/graphics/shape.rs
+++ b/src/library/graphics/shape.rs
@@ -104,7 +104,7 @@ impl<const S: ShapeKind> Layout for ShapeNode<S> {
let target = regions.expand.select(regions.first, Size::zero());
target.x.max(target.y)
} else {
- let size = frames[0].size;
+ let size = frames[0].size();
let desired = size.x.max(size.y);
desired.min(regions.first.x).min(regions.first.y)
};
@@ -146,8 +146,8 @@ impl<const S: ShapeKind> Layout for ShapeNode<S> {
}
};
- let outset = styles.get(Self::OUTSET).relative_to(frame.size);
- let size = frame.size + outset.sum_by_axis();
+ let outset = styles.get(Self::OUTSET).relative_to(frame.size());
+ let size = frame.size() + outset.sum_by_axis();
let radius = styles
.get(Self::RADIUS)
diff --git a/src/library/graphics/transform.rs b/src/library/graphics/transform.rs
index 9fcf7ebb..7176a683 100644
--- a/src/library/graphics/transform.rs
+++ b/src/library/graphics/transform.rs
@@ -33,7 +33,7 @@ impl Layout for MoveNode {
let delta = self.delta.resolve(styles);
for frame in &mut frames {
- let delta = delta.zip(frame.size).map(|(d, s)| d.relative_to(s));
+ let delta = delta.zip(frame.size()).map(|(d, s)| d.relative_to(s));
Arc::make_mut(frame).translate(delta.to_point());
}
@@ -94,7 +94,7 @@ impl<const T: TransformKind> Layout for TransformNode<T> {
let mut frames = self.child.layout(ctx, regions, styles)?;
for frame in &mut frames {
- let Spec { x, y } = origin.zip(frame.size).map(|(o, s)| o.position(s));
+ let Spec { x, y } = origin.zip(frame.size()).map(|(o, s)| o.position(s));
let transform = Transform::translate(x, y)
.pre_concat(self.transform)
.pre_concat(Transform::translate(-x, -y));