From 80a9b300d1acb8821ac0600aad3d2135ad9587bd Mon Sep 17 00:00:00 2001
From: Martin <mhaug@live.de>
Date: Fri, 18 Jun 2021 13:01:55 +0200
Subject: Ref count the frames

---
 src/layout/background.rs | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'src/layout/background.rs')

diff --git a/src/layout/background.rs b/src/layout/background.rs
index 41138bdf..8390a756 100644
--- a/src/layout/background.rs
+++ b/src/layout/background.rs
@@ -23,10 +23,11 @@ impl Layout for BackgroundNode {
         &self,
         ctx: &mut LayoutContext,
         regions: &Regions,
-    ) -> Vec<Constrained<Frame>> {
+    ) -> Vec<Constrained<Rc<Frame>>> {
         let mut frames = self.child.layout(ctx, regions);
-
         for frame in &mut frames {
+            let mut new = Frame::new(frame.size, frame.baseline);
+
             let (point, shape) = match self.shape {
                 BackgroundShape::Rect => (Point::zero(), Shape::Rect(frame.size)),
                 BackgroundShape::Ellipse => {
@@ -35,9 +36,13 @@ impl Layout for BackgroundNode {
             };
 
             let element = Element::Geometry(shape, self.fill);
-            frame.item.elements.insert(0, (point, element));
-        }
+            new.push(point, element);
 
+            let prev = std::mem::take(&mut frame.item);
+            new.push_frame(Point::zero(), prev);
+
+            *Rc::make_mut(&mut frame.item) = new;
+        }
         frames
     }
 }
-- 
cgit v1.2.3