Add mix-blend-mode to public API

fschutt · Sep 17, 2021 · 44f91d8 · 44f91d8
1 parent adf4ee0
commit 44f91d8
Show file tree

Hide file tree

Showing 11 changed files with 547 additions and 17 deletions.
diff --git a/api.json b/api.json
@@ -3638,7 +3638,7 @@
                         {"TransformOrigin": {}},
                         {"PerspectiveOrigin": {}},
                         {"BackfaceVisibility": {}},
-                        {"BlendMode": {}},
+                        {"MixBlendMode": {}},
                         {"Filter": {}},
                         {"BackdropFilter": {}},
                         {"TextShadow": {}}
@@ -5371,6 +5371,27 @@
                         { "Exact": { "type": "StyleBackfaceVisibility" }}
                     ]
                 },
+                "StyleMixBlendModeValue": {
+                    "external": "azul_impl::css::StyleMixBlendModeValue",
+                    "derive": ["Copy"],
+                    "enum_fields": [
+                        { "Auto": { }} ,
+                        { "None": { }} ,
+                        { "Inherit": { }} ,
+                        { "Initial": { }} ,
+                        { "Exact": { "type": "StyleMixBlendMode" }}
+                    ]
+                },
+                "StyleFilterVecValue": {
+                    "external": "azul_impl::css::StyleFilterVecValue",
+                    "enum_fields": [
+                        { "Auto": { }} ,
+                        { "None": { }} ,
+                        { "Inherit": { }} ,
+                        { "Initial": { }} ,
+                        { "Exact": { "type": "StyleFilterVec" }}
+                    ]
+                },
                 "CssProperty": {
                     "doc": "Parsed CSS key-value pair",
                     "external": "azul_impl::css::CssProperty",
@@ -5444,7 +5465,11 @@
                         {"Transform": {"type": "StyleTransformVecValue"}},
                         {"TransformOrigin": {"type": "StyleTransformOriginValue"}},
                         {"PerspectiveOrigin": {"type": "StylePerspectiveOriginValue"}},
-                        {"BackfaceVisibility": {"type": "StyleBackfaceVisibilityValue"}}
+                        {"BackfaceVisibility": {"type": "StyleBackfaceVisibilityValue"}},
+                        {"MixBlendMode": {"type": "StyleMixBlendModeValue"}},
+                        {"Filter": {"type": "StyleFilterVecValue"}},
+                        {"BackdropFilter": {"type": "StyleFilterVecValue"}},
+                        {"TextShadow": {"type": "StyleBoxShadowValue"}}
                     ],
                     "functions": {
                         "get_key_string": {

diff --git a/api/_patches/azul.rs/css.rs b/api/_patches/azul.rs/css.rs
@@ -5,6 +5,7 @@
         StyleBackgroundRepeatVec,
         StyleTransformVec,
         StyleFontFamilyVec,
+        StyleFilterVec,
     };
 
     macro_rules! css_property_from_type {($prop_type:expr, $content_type:ident) => ({
@@ -79,6 +80,10 @@
             CssPropertyType::PerspectiveOrigin => CssProperty::PerspectiveOrigin(StylePerspectiveOriginValue::$content_type),
             CssPropertyType::TransformOrigin => CssProperty::TransformOrigin(StyleTransformOriginValue::$content_type),
             CssPropertyType::BackfaceVisibility => CssProperty::BackfaceVisibility(StyleBackfaceVisibilityValue::$content_type),
+            CssPropertyType::MixBlendMode => CssProperty::MixBlendMode(StyleMixBlendModeValue::$content_type),
+            CssPropertyType::Filter => CssProperty::Filter(StyleFilterVecValue::$content_type),
+            CssPropertyType::BackdropFilter => CssProperty::BackdropFilter(StyleFilterVecValue::$content_type),
+            CssPropertyType::TextShadow => CssProperty::TextShadow(StyleBoxShadowValue::$content_type),
         }
     })}
 
@@ -157,6 +162,10 @@
                 CssProperty::PerspectiveOrigin(_) => CssPropertyType::PerspectiveOrigin,
                 CssProperty::TransformOrigin(_) => CssPropertyType::TransformOrigin,
                 CssProperty::BackfaceVisibility(_) => CssPropertyType::BackfaceVisibility,
+                CssProperty::MixBlendMode(_) => CssPropertyType::MixBlendMode,
+                CssProperty::Filter(_) => CssPropertyType::Filter,
+                CssProperty::BackdropFilter(_) => CssPropertyType::BackdropFilter,
+                CssProperty::TextShadow(_) => CssPropertyType::TextShadow,
             }
         }
 
@@ -236,7 +245,10 @@
         pub const fn transform_origin(input: StyleTransformOrigin) -> Self { CssProperty::TransformOrigin(StyleTransformOriginValue::Exact(input)) }
         pub const fn perspective_origin(input: StylePerspectiveOrigin) -> Self { CssProperty::PerspectiveOrigin(StylePerspectiveOriginValue::Exact(input)) }
         pub const fn backface_visiblity(input: StyleBackfaceVisibility) -> Self { CssProperty::BackfaceVisibility(StyleBackfaceVisibilityValue::Exact(input)) }
-
+        pub const fn mix_blend_mode(input: StyleMixBlendMode) -> Self { CssProperty::MixBlendMode(StyleMixBlendModeValue::Exact(input)) }
+        pub const fn filter(input: StyleFilterVec) -> Self { CssProperty::Filter(StyleFilterVecValue::Exact(input)) }
+        pub const fn backdrop_filter(input: StyleFilterVec) -> Self { CssProperty::BackdropFilter(StyleFilterVecValue::Exact(input)) }
+        pub const fn text_shadow(input: StyleBoxShadow) -> Self { CssProperty::TextShadow(StyleBoxShadowValue::Exact(input)) }
     }
 
     const FP_PRECISION_MULTIPLIER: f32 = 1000.0;

diff --git a/api/_patches/azul.rs/vec.rs b/api/_patches/azul.rs/vec.rs
@@ -350,7 +350,8 @@
     impl_vec_clone!(AzInputNodeAndIndex, AzInputNodeAndIndexVec, AzInputNodeAndIndexVecDestructor);
     impl_vec!(AzLogicalRect, AzLogicalRectVec, AzLogicalRectVecDestructor, az_logical_rect_vec_destructor, AzLogicalRectVec_delete);
     impl_vec_clone!(AzLogicalRect, AzLogicalRectVec, AzLogicalRectVecDestructor);
-
+    impl_vec!(AzStyleFilter, AzStyleFilterVec, AzStyleFilterVecDestructor, az_style_filter_vec_destructor, AzStyleFilterVec_delete);
+    impl_vec_clone!(AzStyleFilter, AzStyleFilterVec, AzStyleFilterVecDestructor);
 
     impl_vec!(AzAccessibilityState,  AzAccessibilityStateVec,  AzAccessibilityStateVecDestructor, az_accessibility_state_vec_destructor, AzAccessibilityStateVec_delete);
     impl_vec_clone!(AzAccessibilityState,  AzAccessibilityStateVec,  AzAccessibilityStateVecDestructor);