Locate me!

1 files changed, 10 insertions, 4 deletions

diff --git a/src/model/layout.rs b/src/model/layout.rs
index 6dfbcb90..49720be4 100644
--- a/src/model/layout.rs
+++ b/src/model/layout.rs
@@ -221,13 +221,19 @@ impl Layout for LayoutNode {
         regions: &Regions,
         styles: StyleChain,
     ) -> TypResult<Vec<Arc<Frame>>> {
-        crate::memo::memoized(
-            (self, ctx, regions, styles),
+        let (result, cursor) = crate::memo::memoized(
+            (self, &mut *ctx, regions, styles),
             |(node, ctx, regions, styles)| {
                 let entry = StyleEntry::Barrier(Barrier::new(node.id()));
-                node.0.layout(ctx, regions, entry.chain(&styles))
+                let result = node.0.layout(ctx, regions, entry.chain(&styles));
+                (result, ctx.pins.cursor())
             },
-        )
+        );
+
+        // Replay the side effect in case of caching. This should currently be
+        // more or less the only relevant side effect on the context.
+        ctx.pins.jump(cursor);
+        result
     }
 
     fn pack(self) -> LayoutNode {