wip

odoo · Sep 11, 2024 · 62a4b1a · 62a4b1a
1 parent fcb33fe
commit 62a4b1a
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 0 deletions.
diff --git a/src/web/vaev-base/flex.h b/src/web/vaev-base/flex.h
@@ -23,6 +23,23 @@ enum struct FlexWrap {
     _LEN
 };
 
+struct FlexFlow {
+    FlexDirection direction;
+    FlexWrap wrap;
+
+    constexpr FlexFlow(FlexDirection direction, FlexWrap wrap)
+        : direction(direction), wrap(wrap) {
+    }
+
+    constexpr FlexFlow(FlexDirection direction)
+        : direction(direction) {
+    }
+
+    constexpr FlexFlow(FlexWrap wrap)
+        : wrap(wrap) {
+    }
+};
+
 struct FlexBasis {
     enum struct Type {
         CONTENT,

diff --git a/src/web/vaev-style/styles.h b/src/web/vaev-style/styles.h
@@ -840,6 +840,30 @@ struct FlexWrapProp {
     }
 };
 
+// https://www.w3.org/TR/css-flexbox-1/#propdef-flex-flow
+struct FlexFlowProp {
+    FlexFlow value = initial();
+
+    static constexpr Str name() { return "flex-flow"; }
+
+    static constexpr FlexFlow initial() { 
+        return FlexFlow{
+            FlexDirection::ROW,
+            FlexWrap::NOWRAP,
+        }; 
+    }
+
+    void apply(Computed &c) const {
+        c.flex.cow().direction = value.distance;
+        c.flex.cow().wrap = value.wrap;
+    }
+
+    Res<> parse(Cursor<Css::Sst> &c) {
+        value = try$(parseValue<FlexFlow>(c));
+        return Ok();
+    }
+};
+
 // MARK: Fonts -----------------------------------------------------------------
 
 // https://www.w3.org/TR/css-fonts-4/#font-family-prop
@@ -1561,6 +1585,7 @@ using _StyleProp = Union<
     FlexGrowProp,
     FlexShrinkProp,
     FlexWrapProp,
+    FlexFlowProp,
 
     // Font
     FontFamilyProp,

diff --git a/src/web/vaev-style/values.cpp b/src/web/vaev-style/values.cpp
@@ -398,6 +398,25 @@ Res<FlexWrap> ValueParser<FlexWrap>::parse(Cursor<Css::Sst> &c) {
         return Error::invalidData("expected flex wrap");
 }
 
+// MARK: FlexFlow
+// https://drafts.csswg.org/css-flexbox-1/#flex-flow-property
+Res<FlexFlow> ValueParser<FlexFlow>::parse(Cursor<Css::Sst> &c) {
+    if (c.ended())
+        return Error::invalidData("unexpected end of input");
+
+    auto direction = parseValue<FlexDirection>(c);
+    auto wrap = parseValue<FlexWrap>(c);
+
+    if(direction && wrap)
+        return Ok(FlexFlow(direction.unwrap(), wrap.unwrap()));
+    else if(direction && !wrap)
+        return Ok(FlexFlow(direction.unwrap()));
+    else if(!direction && wrap)
+        return Ok(FlexFlow(wrap.unwrap()));
+    else
+        return Error::invalidData("expected flex direction or wrap");
+}
+
 // MARK: FlexBasis
 // https://drafts.csswg.org/css-flexbox-1/#flex-basis-property
 Res<FlexBasis> ValueParser<FlexBasis>::parse(Cursor<Css::Sst> &c) {

diff --git a/src/web/vaev-style/values.h b/src/web/vaev-style/values.h
@@ -75,6 +75,11 @@ struct ValueParser<FlexWrap> {
     static Res<FlexWrap> parse(Cursor<Css::Sst> &c);
 };
 
+template <>
+struct ValueParser<FlexFlow> {
+    static Res<FlexFlow> parse(Cursor<Css::Sst> &c);
+};
+
 template <>
 struct ValueParser<FlexBasis> {
     static Res<FlexBasis> parse(Cursor<Css::Sst> &c);