vaev-style: Setup two pass for custom properties.

odoo · Nov 26, 2024 · d581ebb · d581ebb
1 parent f6c4af4
commit d581ebb
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/src/vaev-style/computer.cpp b/src/vaev-style/computer.cpp
@@ -66,12 +66,22 @@ Strong<Computed> Computer::computeFor(Computed const &parent, Markup::Element co
     computed->inherit(parent);
     Vec<Cursor<StyleProp>> importantProps;
 
+    // HACK: Apply custom properties first
     for (auto const &styleRule : matchingRules) {
         for (auto &prop : styleRule->props) {
-            if (prop.important == Important::NO)
+            if (prop.is<CustomProp>())
                 prop.apply(*computed);
-            else
-                importantProps.pushBack(&prop);
+        }
+    }
+
+    for (auto const &styleRule : matchingRules) {
+        for (auto &prop : styleRule->props) {
+            if (not prop.is<CustomProp>()) {
+                if (prop.important == Important::NO)
+                    prop.apply(*computed);
+                else
+                    importantProps.pushBack(&prop);
+            }
         }
     }