Rework style chain access

3 files changed, 20 insertions, 20 deletions

diff --git a/library/src/visualize/image.rs b/library/src/visualize/image.rs
index fa5b70ad..1bc864e5 100644
--- a/library/src/visualize/image.rs
+++ b/library/src/visualize/image.rs
@@ -90,7 +90,7 @@ impl Layout for ImageNode {
         };
 
         // Compute the actual size of the fitted image.
-        let fit = styles.get(Self::FIT);
+        let fit = Self::fit_in(styles);
         let fitted = match fit {
             ImageFit::Cover | ImageFit::Contain => {
                 if wide == (fit == ImageFit::Contain) {
diff --git a/library/src/visualize/line.rs b/library/src/visualize/line.rs
index 6fc7fc19..6beb7beb 100644
--- a/library/src/visualize/line.rs
+++ b/library/src/visualize/line.rs
@@ -84,7 +84,7 @@ impl Layout for LineNode {
         styles: StyleChain,
         regions: Regions,
     ) -> SourceResult<Fragment> {
-        let stroke = styles.get(Self::STROKE).unwrap_or_default();
+        let stroke = Self::stroke_in(styles).unwrap_or_default();
 
         let origin = self
             .start()
diff --git a/library/src/visualize/shape.rs b/library/src/visualize/shape.rs
index b3b9364f..fc1d462e 100644
--- a/library/src/visualize/shape.rs
+++ b/library/src/visualize/shape.rs
@@ -167,11 +167,11 @@ impl Layout for RectNode {
             ShapeKind::Rect,
             &self.body(),
             Axes::new(self.width(), self.height()),
-            styles.get(Self::FILL),
-            styles.get(Self::STROKE),
-            styles.get(Self::INSET),
-            styles.get(Self::OUTSET),
-            styles.get(Self::RADIUS),
+            Self::fill_in(styles),
+            Self::stroke_in(styles),
+            Self::inset_in(styles),
+            Self::outset_in(styles),
+            Self::radius_in(styles),
         )
     }
 }
@@ -301,11 +301,11 @@ impl Layout for SquareNode {
             ShapeKind::Square,
             &self.body(),
             Axes::new(self.width(), self.height()),
-            styles.get(Self::FILL),
-            styles.get(Self::STROKE),
-            styles.get(Self::INSET),
-            styles.get(Self::OUTSET),
-            styles.get(Self::RADIUS),
+            Self::fill_in(styles),
+            Self::stroke_in(styles),
+            Self::inset_in(styles),
+            Self::outset_in(styles),
+            Self::radius_in(styles),
         )
     }
 }
@@ -394,10 +394,10 @@ impl Layout for EllipseNode {
             ShapeKind::Ellipse,
             &self.body(),
             Axes::new(self.width(), self.height()),
-            styles.get(Self::FILL),
-            styles.get(Self::STROKE).map(Sides::splat),
-            styles.get(Self::INSET),
-            styles.get(Self::OUTSET),
+            Self::fill_in(styles),
+            Self::stroke_in(styles).map(Sides::splat),
+            Self::inset_in(styles),
+            Self::outset_in(styles),
             Corners::splat(Rel::zero()),
         )
     }
@@ -522,10 +522,10 @@ impl Layout for CircleNode {
             ShapeKind::Circle,
             &self.body(),
             Axes::new(self.width(), self.height()),
-            styles.get(Self::FILL),
-            styles.get(Self::STROKE).map(Sides::splat),
-            styles.get(Self::INSET),
-            styles.get(Self::OUTSET),
+            Self::fill_in(styles),
+            Self::stroke_in(styles).map(Sides::splat),
+            Self::inset_in(styles),
+            Self::outset_in(styles),
             Corners::splat(Rel::zero()),
         )
     }