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

Make C++'s Color consistent with Rust's Color

Browse source 
sixtyfps::Color shall have the same minimal API by providing from_argb_encoded and as_argb_encoded.
This commit is contained in:
Simon Hausmann 2020-09-08 22:19:58 +02:00
parent 02b3bce6dc
commit 09142beac4
2 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
api/sixtyfps-cpp/include/sixtyfps_color.h
View file

@ -20,12 +20,20 @@ class Color
{
public:
Color() { inner.red = inner.green = inner.blue = inner.alpha = 0; }
explicit Color(uint32_t argb_encoded)
static Color from_argb_encoded(uint32_t argb_encoded)
{
inner.red = (argb_encoded >> 16) & 0xff;
inner.green = (argb_encoded >> 8) & 0xff;
inner.blue = argb_encoded & 0xff;
inner.alpha = (argb_encoded >> 24) & 0xff;
Color col;
col.inner.red = (argb_encoded >> 16) & 0xff;
col.inner.green = (argb_encoded >> 8) & 0xff;
col.inner.blue = argb_encoded & 0xff;
col.inner.alpha = (argb_encoded >> 24) & 0xff;
return col;
}
uint32_t as_argb_encoded() const
{
return (uint32_t(inner.red) << 16) | (uint32_t(inner.green) << 8) | uint32_t(inner.blue)
| (uint32_t(inner.alpha) << 24);
}
friend bool operator==(const Color &lhs, const Color &rhs)

4
sixtyfps_compiler/generator/cpp.rs
View file

@ -1019,7 +1019,9 @@ fn compile_expression(e: &crate::expression_tree::Expression, component: &Rc<Com
format!("std::make_shared<sixtyfps::IntModel>({})", f)
}
(Type::Array(_), Type::Model) => f,
(Type::Float32, Type::Color) => format!("sixtyfps::Color({})", f),
(Type::Float32, Type::Color) => {
format!("sixtyfps::Color::from_argb_encoded({})", f)
}
_ => f,
}
}