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

Remove Value::Color

Browse source
This commit is contained in:
Olivier Goffart 2021-03-15 12:33:47 +01:00
parent 34632206e6
commit 41f52f9ad4
2 changed files with 26 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

9
api/sixtyfps-node/native/lib.rs
View file

@ -185,12 +185,7 @@ fn to_eval_value<'cx>(
.value()
.parse::<css_color_parser2::Color>()
.or_else(|e| cx.throw_error(&e.to_string()))?;
Ok(Value::Color(sixtyfps_corelib::Color::from_argb_u8(
(c.a * 255.) as u8,
c.r,
c.g,
c.b,
)))
Ok((sixtyfps_corelib::Color::from_argb_u8((c.a * 255.) as u8, c.r, c.g, c.b)).into())
}
Type::Array(a) => match val.downcast::<JsArray>() {
Ok(arr) => {
@ -281,7 +276,7 @@ fn to_js_value<'cx>(
}
js_object.as_value(cx)
}
Value::Color(c) | Value::Brush(sixtyfps_corelib::Brush::SolidColor(c)) => JsString::new(
Value::Brush(sixtyfps_corelib::Brush::SolidColor(c)) => JsString::new(
cx,
&format!("#{:02x}{:02x}{:02x}{:02x}", c.red(), c.green(), c.blue(), c.alpha()),
)