aboutsummaryrefslogtreecommitdiffstats
path: root/src/css
diff options
context:
space:
mode:
authorbptato <nincsnevem662@gmail.com>2025-02-17 18:54:00 +0100
committerbptato <nincsnevem662@gmail.com>2025-02-17 19:36:57 +0100
commit538a8a23a5d07663c545093511c2a8281708ba49 (patch)
treebbc46e8573796b07b88fffe0106211fab2b7fd54 /src/css
parentd6eb9be13115582182c4a0980e6be28c63ce3503 (diff)
downloadchawan-538a8a23a5d07663c545093511c2a8281708ba49.tar.gz
render: respect stacking context for inline boxes
Also, eliminate the offset attribute in StackItem by just taking render.offset from the nearest ancestor as the base. That leaves us with clipBox, which I'm not yet sure how to get rid of. Its current implementation is certainly wrong: `position: absolute' should really use its absolute container's clip box. It is however correct for `position: relative' in its current form. (One way would be to cache it inside CSSBox, like we do offset.)
Diffstat (limited to 'src/css')
-rw-r--r--src/css/render.nim63
1 files changed, 42 insertions, 21 deletions
diff --git a/src/css/render.nim b/src/css/render.nim
index 7a859baf..875cf5c0 100644
--- a/src/css/render.nim
+++ b/src/css/render.nim
@@ -42,10 +42,8 @@ type
start: Offset
send: Offset
- StackItem = ref object
- box: BlockBox
- offset: Offset
- apos: Offset
+ StackItem = object
+ box: CSSBox
clipBox: ClipBox
index: int
@@ -57,6 +55,10 @@ type
nstack: seq[StackItem]
spaces: string # buffer filled with spaces for padding
+# Forward declarations
+proc renderBlock(grid: var FlexibleGrid; state: var RenderState;
+ box: BlockBox; offset: Offset; pass2 = false)
+
template attrs(state: RenderState): WindowAttributes =
state.attrsp[]
@@ -343,9 +345,6 @@ proc paintBackground(grid: var FlexibleGrid; state: var RenderState;
it.format.bgcolor = it.format.bgcolor.blend(color, alpha)
it.node = node
-proc renderBlockBox(grid: var FlexibleGrid; state: var RenderState;
- box: BlockBox; offset: Offset; pass2 = false)
-
proc paintInlineBox(grid: var FlexibleGrid; state: var RenderState;
box: InlineBox; offset: Offset; bgcolor: CellColor; alpha: uint8) =
for area in box.state.areas:
@@ -356,10 +355,19 @@ proc paintInlineBox(grid: var FlexibleGrid; state: var RenderState;
grid.paintBackground(state, bgcolor, x1, y1, x2, y2, box.element,
alpha)
-proc renderInlineBox(grid: var FlexibleGrid; state: var RenderState;
- ibox: InlineBox; offset: Offset; bgcolor0: ARGBColor;
+proc renderInline(grid: var FlexibleGrid; state: var RenderState;
+ ibox: InlineBox; offset: Offset; bgcolor0 = rgba(0, 0, 0, 0);
pass2 = false) =
- #TODO stacking contexts
+ let position = ibox.computed{"position"}
+ #TODO handle negative z-index
+ let zindex = ibox.computed{"z-index"}
+ if position != PositionStatic and not pass2 and zindex >= 0:
+ state.nstack.add(StackItem(
+ box: ibox,
+ clipBox: state.clipBox,
+ index: zindex
+ ))
+ return
let bgcolor = ibox.computed{"background-color"}
var bgcolor0 = bgcolor0
if bgcolor.isCell:
@@ -413,11 +421,11 @@ proc renderInlineBox(grid: var FlexibleGrid; state: var RenderState;
else: # InlineNewLineBox does not have children, so we handle it here
for child in ibox.children:
if child of InlineBox:
- grid.renderInlineBox(state, InlineBox(child), offset, bgcolor0)
+ grid.renderInline(state, InlineBox(child), offset, bgcolor0)
else:
- grid.renderBlockBox(state, BlockBox(child), offset)
+ grid.renderBlock(state, BlockBox(child), offset)
-proc renderBlockBox(grid: var FlexibleGrid; state: var RenderState;
+proc renderBlock(grid: var FlexibleGrid; state: var RenderState;
box: BlockBox; offset: Offset; pass2 = false) =
let position = box.computed{"position"}
#TODO handle negative z-index
@@ -425,7 +433,6 @@ proc renderBlockBox(grid: var FlexibleGrid; state: var RenderState;
if position != PositionStatic and not pass2 and zindex >= 0:
state.nstack.add(StackItem(
box: box,
- offset: offset,
clipBox: state.clipBox,
index: zindex
))
@@ -480,16 +487,30 @@ proc renderBlockBox(grid: var FlexibleGrid; state: var RenderState;
state.clipBox.start.y < state.clipBox.send.y:
for child in box.children:
if child of InlineBox:
- grid.renderInlineBox(state, InlineBox(child), offset,
- rgba(0, 0, 0, 0))
+ grid.renderInline(state, InlineBox(child), offset)
else:
- grid.renderBlockBox(state, BlockBox(child), offset)
+ grid.renderBlock(state, BlockBox(child), offset)
if hasClipBox:
discard state.clipBoxes.pop()
-proc renderDocument*(grid: var FlexibleGrid; bgcolor: var CellColor;
- rootBox: BlockBox; attrsp: ptr WindowAttributes;
- images: var seq[PosBitmap]) =
+func findBlockParent(box: CSSBox): BlockBox =
+ var it {.cursor.} = box.parent
+ while it != nil:
+ if it of BlockBox:
+ return BlockBox(it)
+ it = it.parent
+
+proc renderPositioned(grid: var FlexibleGrid; state: var RenderState;
+ box: CSSBox) =
+ let parent = box.findBlockParent()
+ let offset = if parent != nil: parent.render.offset else: offset(0, 0)
+ if box of BlockBox:
+ grid.renderBlock(state, BlockBox(box), offset, pass2 = true)
+ else:
+ grid.renderInline(state, InlineBox(box), offset, pass2 = true)
+
+proc render*(grid: var FlexibleGrid; bgcolor: var CellColor; rootBox: BlockBox;
+ attrsp: ptr WindowAttributes; images: var seq[PosBitmap]) =
grid.setLen(0)
if rootBox == nil:
# no HTML element when we run cascade; just clear all lines.
@@ -503,7 +524,7 @@ proc renderDocument*(grid: var FlexibleGrid; bgcolor: var CellColor;
while stack.len > 0:
for it in stack:
state.clipBoxes.add(it.clipBox)
- grid.renderBlockBox(state, it.box, it.offset, true)
+ grid.renderPositioned(state, it.box)
discard state.clipBoxes.pop()
stack = move(state.nstack)
stack.sort(proc(x, y: StackItem): int = cmp(x.index, y.index))