language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-10-01 14:21:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Allow an implicit conversion from a color or a linear gradient to Brush in C++

Browse source
This commit is contained in:
Simon Hausmann 2021-02-03 14:42:21 +01:00
parent c41062e9bb
commit 262eb00af4
2 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
api/sixtyfps-cpp/include/sixtyfps_brush.h
View file

@ -54,11 +54,8 @@ class Brush
{ {
public: public:
Brush() : data(Inner::NoBrush()) { } Brush() : data(Inner::NoBrush()) { }
explicit Brush(const Color &color) : data(Inner::SolidColor(color.inner)) { } Brush(const Color &color) : data(Inner::SolidColor(color.inner)) { }
explicit Brush(const LinearGradientBrush &gradient) Brush(const LinearGradientBrush &gradient) : data(Inner::LinearGradient(gradient.inner)) { }
: 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; }
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; }

5
sixtyfps_compiler/generator/cpp.rs
View file

@ -1479,9 +1479,6 @@ fn compile_expression(
(Type::Float32, Type::Color) => { (Type::Float32, Type::Color) => {
format!("sixtyfps::Color::from_argb_encoded({})", f) format!("sixtyfps::Color::from_argb_encoded({})", f)
} }
(Type::Color, Type::Brush) => {
format!("sixtyfps::Brush({})", f)
}
(Type::Object { .. }, Type::Object{ fields, name: Some(n)}) => { (Type::Object { .. }, Type::Object{ fields, name: Some(n)}) => {
format!( format!(
"[&](const auto &o){{ {struct_name} s; auto& [{field_members}] = s; {fields}; return s; }}({obj})", "[&](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!("sixtyfps::GradientStop{{ {}, {}, }}", color, position)
}); });
format!( 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() stops_it.join(", "), angle, stops.len()
) )
} }