strwidth, renderdocument: small refactoring

* put attrs pointer in state
* simplify width()
* use unsigned int as ptint to avoid UB

1 files changed, 8 insertions, 5 deletions

diff --git a/src/layout/engine.nim b/src/layout/engine.nim
index 4c56ffd9..d2d22ab9 100644
--- a/src/layout/engine.nim
+++ b/src/layout/engine.nim
@@ -15,7 +15,7 @@ import utils/widthconv
 
 type
   LayoutState = ref object
-    attrs: WindowAttributes
+    attrsp: ptr WindowAttributes
     positioned: seq[AvailableSpace]
 
   # min-content: box width is longest word's width
@@ -45,6 +45,9 @@ type
     minHeight: LayoutUnit
     maxHeight: LayoutUnit
 
+template attrs(state: LayoutState): WindowAttributes =
+  state.attrsp[]
+
 func maxContent(): SizeConstraint =
   return SizeConstraint(t: MAX_CONTENT)
 
@@ -2774,13 +2777,13 @@ proc generateTableBox(styledNode: StyledNode, lctx: LayoutState,
   box.generateTableChildWrappers()
   return box
 
-proc renderLayout*(root: StyledNode, attrs: WindowAttributes): BlockBox =
+proc renderLayout*(root: StyledNode, attrsp: ptr WindowAttributes): BlockBox =
   let space = AvailableSpace(
-    w: stretch(attrs.width_px),
-    h: stretch(attrs.height_px)
+    w: stretch(attrsp[].width_px),
+    h: stretch(attrsp[].height_px)
   )
   let lctx = LayoutState(
-    attrs: attrs,
+    attrsp: attrsp,
     positioned: @[space]
   )
   let builder = root.generateBlockBox(lctx)