layout: fix list-item positioning

we also have to move the inner box offset to the parent

2 files changed, 12 insertions, 3 deletions

diff --git a/src/layout/box.nim b/src/layout/box.nim
index bbb3d91e..79f927ef 100644
--- a/src/layout/box.nim
+++ b/src/layout/box.nim
@@ -76,3 +76,10 @@ type
     firstBaseline*: LayoutUnit
     # baseline of the last line box of all descendants
     baseline*: LayoutUnit
+
+func `+`*(a, b: Offset): Offset =
+  return Offset(x: a.x + b.x, y: a.y + b.y)
+
+proc `+=`*(a: var Offset; b: Offset) =
+  a.x += b.x
+  a.y += b.y
diff --git a/src/layout/engine.nim b/src/layout/engine.nim
index aea9f2c8..788824da 100644
--- a/src/layout/engine.nim
+++ b/src/layout/engine.nim
@@ -1348,7 +1348,7 @@ proc layoutListItem(bctx: var BlockContext; box: BlockBox;
   if builder.marker != nil:
     # wrap marker + main box in a new box
     let innerBox = BlockBox(
-      computed: builder.computed,
+      computed: builder.content.computed,
       node: builder.node,
       offset: Offset(x: sizes.margin.left),
       margin: sizes.margin
@@ -1373,9 +1373,11 @@ proc layoutListItem(bctx: var BlockContext; box: BlockBox;
     box.baseline = innerBox.baseline
     box.firstBaseline = innerBox.firstBaseline
     box.size = innerBox.size
-    # innerBox can keep its margin without double margin, it won't be used
-    # anymore.
+    # move innerBox margin & offset to outer box
+    box.offset += innerBox.offset
     box.margin = innerBox.margin
+    innerBox.offset = Offset()
+    innerBox.margin = RelativeRect()
     box.nested = @[marker, innerBox]
   else:
     bctx.layoutFlow(box, builder.content, sizes)