diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/css/values.nim | 31 | ||||
| -rw-r--r-- | src/layout/engine.nim | 8 |
2 files changed, 31 insertions, 8 deletions
diff --git a/src/css/values.nim b/src/css/values.nim index 5bceed5b..c473cdee 100644 --- a/src/css/values.nim +++ b/src/css/values.nim @@ -24,6 +24,7 @@ type cstBackground = "background" cstListStyle = "list-style" cstFlex = "flex" + cstFlexFlow = "flex-flow" CSSUnit* = enum UNIT_CM, UNIT_MM, UNIT_IN, UNIT_PX, UNIT_PT, UNIT_PC, UNIT_EM, UNIT_EX, @@ -1467,7 +1468,7 @@ const PropertyPaddingSpec = [ cptPaddingLeft ] -proc getComputedValues0(res: var seq[CSSComputedEntry], d: CSSDeclaration): +proc getComputedValues0(res: var seq[CSSComputedEntry]; d: CSSDeclaration): Err[void] = case shorthandType(d.name) of cstNone: @@ -1542,6 +1543,7 @@ proc getComputedValues0(res: var seq[CSSComputedEntry], d: CSSDeclaration): # flex-grow let val = CSSComputedValue(v: cvtNumber, number: r.get) res.add((cptFlexGrow, val, global)) + inc i d.value.skipWhitespace(i) if i < d.value.len: if not d.value[i].isToken: @@ -1550,6 +1552,7 @@ proc getComputedValues0(res: var seq[CSSComputedEntry], d: CSSDeclaration): # flex-shrink let val = CSSComputedValue(v: cvtNumber, number: r.get) res.add((cptFlexShrink, val, global)) + inc i d.value.skipWhitespace(i) if res.len < 1: # flex-grow omitted, default to 1 let val = CSSComputedValue(v: cvtNumber, number: 1) @@ -1566,7 +1569,31 @@ proc getComputedValues0(res: var seq[CSSComputedEntry], d: CSSDeclaration): v: cvtLength, length: CSSLength(unit: UNIT_PX, num: 0) ) - res.add((cptFlexGrow, val, global)) + res.add((cptFlexBasis, val, global)) + else: + res.add((cptFlexGrow, getDefault(cptFlexGrow), global)) + res.add((cptFlexShrink, getDefault(cptFlexShrink), global)) + res.add((cptFlexBasis, getDefault(cptFlexBasis), global)) + of cstFlexFlow: + let global = cssGlobal(d) + if global == cvtNoglobal: + var i = 0 + d.value.skipWhitespace(i) + if i >= d.value.len: + return err() + if (let dir = cssFlexDirection(d.value[i]); dir.isSome): + # flex-direction + let val = CSSComputedValue(v: cvtFlexDirection, flexdirection: dir.get) + res.add((cptFlexDirection, val, global)) + inc i + d.value.skipWhitespace(i) + if i < d.value.len: + let wrap = ?cssFlexWrap(d.value[i]) + let val = CSSComputedValue(v: cvtFlexWrap, flexwrap: wrap) + res.add((cptFlexWrap, val, global)) + else: + res.add((cptFlexDirection, getDefault(cptFlexDirection), global)) + res.add((cptFlexWrap, getDefault(cptFlexWrap), global)) return ok() proc getComputedValues(d: CSSDeclaration): seq[CSSComputedEntry] = diff --git a/src/layout/engine.nim b/src/layout/engine.nim index 54b349d0..8084efc9 100644 --- a/src/layout/engine.nim +++ b/src/layout/engine.nim @@ -2114,7 +2114,6 @@ type child: BlockBox builder: BoxBuilder weights: array[FlexWeightType, float64] - space: AvailableSpace sizes: ResolvedSizes FlexMainContext = object @@ -2163,8 +2162,7 @@ proc redistributeWidth(mctx: var FlexMainContext; sizes: ResolvedSizes) = diff += w - maxw it.weights[wt] = 0 w = maxw - it.space.w = stretch(w) - it.sizes = lctx.resolveSizes(it.space, builder.computed) + it.sizes.space.w = stretch(w) totalWeight += it.weights[wt] #TODO we should call this only on freeze, and then put another loop to # the end for non-freezed items @@ -2205,8 +2203,7 @@ proc redistributeHeight(mctx: var FlexMainContext; sizes: ResolvedSizes) = diff += h - maxh it.weights[wt] = 0 h = maxh - it.space.h = stretch(h) - it.sizes = lctx.resolveSizes(it.space, builder.computed) + it.sizes.space.h = stretch(h) totalWeight += it.weights[wt] it.child = lctx.layoutFlexChild(builder, it.sizes) mctx.maxSize.h = max(mctx.maxSize.h, it.child.size.h) @@ -2311,7 +2308,6 @@ proc layoutFlex(bctx: var BlockContext; box: BlockBox; builder: BlockBoxBuilder; child: child, builder: builder, weights: [grow, shrink], - space: sizes.space, sizes: childSizes )) inc i # need to increment index here for needsGrow |