diff --git a/api/sixtyfps-cpp/include/sixtyfps_brush.h b/api/sixtyfps-cpp/include/sixtyfps_brush.h index 1719fb095..d82251470 100644 --- a/api/sixtyfps-cpp/include/sixtyfps_brush.h +++ b/api/sixtyfps-cpp/include/sixtyfps_brush.h @@ -54,11 +54,8 @@ class Brush { public: Brush() : data(Inner::NoBrush()) { } - explicit Brush(const Color &color) : data(Inner::SolidColor(color.inner)) { } - explicit Brush(const LinearGradientBrush &gradient) - : data(Inner::LinearGradient(gradient.inner)) - { - } + Brush(const Color &color) : data(Inner::SolidColor(color.inner)) { } + Brush(const LinearGradientBrush &gradient) : data(Inner::LinearGradient(gradient.inner)) { } friend bool operator==(const Brush &a, const Brush &b) { return a.data == b.data; } friend bool operator!=(const Brush &a, const Brush &b) { return a.data != b.data; } diff --git a/sixtyfps_compiler/generator/cpp.rs b/sixtyfps_compiler/generator/cpp.rs index c4ff271f6..ff24fbfc6 100644 --- a/sixtyfps_compiler/generator/cpp.rs +++ b/sixtyfps_compiler/generator/cpp.rs @@ -1479,9 +1479,6 @@ fn compile_expression( (Type::Float32, Type::Color) => { format!("sixtyfps::Color::from_argb_encoded({})", f) } - (Type::Color, Type::Brush) => { - format!("sixtyfps::Brush({})", f) - } (Type::Object { .. }, Type::Object{ fields, name: Some(n)}) => { format!( "[&](const auto &o){{ {struct_name} s; auto& [{field_members}] = s; {fields}; return s; }}({obj})", @@ -1661,7 +1658,7 @@ fn compile_expression( format!("sixtyfps::GradientStop{{ {}, {}, }}", color, position) }); format!( - "[&] {{ const sixtyfps::GradientStop stops[] = {{ {} }}; return sixtyfps::Brush(sixtyfps::LinearGradientBrush({}, stops, {})); }}()", + "[&] {{ const sixtyfps::GradientStop stops[] = {{ {} }}; return sixtyfps::LinearGradientBrush({}, stops, {}); }}()", stops_it.join(", "), angle, stops.len() ) }