language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-09-29 05:14:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Remove Color::From<u32>

Browse source 
Instead make it clear on the call site what the encoding is (argb).
This commit is contained in:
Simon Hausmann 2020-09-03 11:17:40 +02:00
parent adec90e8d2
commit 3b971a2e2f
3 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sixtyfps_compiler/generator/rust.rs
View file

@ -685,7 +685,7 @@ fn compile_expression(e: &Expression, component: &Rc<Component>) -> TokenStream
(Type::Float32, Type::Model) | (Type::Int32, Type::Model) => quote!((0..#f as i32)), (Type::Float32, Type::Model) | (Type::Int32, Type::Model) => quote!((0..#f as i32)),
(Type::Array(_), Type::Model) => quote!(#f.iter().cloned()), (Type::Array(_), Type::Model) => quote!(#f.iter().cloned()),
(Type::Float32, Type::Color) => { (Type::Float32, Type::Color) => {
quote!(sixtyfps::re_exports::Color::from(#f as u32)) quote!(sixtyfps::re_exports::Color::from_argb_encoded(#f as u32))
} }
_ => f, _ => f,
} }

6
sixtyfps_runtime/corelib/graphics.rs
View file

@ -104,12 +104,6 @@ impl Color {
pub const TRANSPARENT: Color = Color::from_rgba(0, 0, 0, 0); pub const TRANSPARENT: Color = Color::from_rgba(0, 0, 0, 0);
} }
impl From<u32> for Color {
fn from(encoded: u32) -> Self {
Color::from_argb_encoded(encoded)
}
}
impl InterpolatedPropertyValue for Color { impl InterpolatedPropertyValue for Color {
fn interpolate(self, target_value: Self, t: f32) -> Self { fn interpolate(self, target_value: Self, t: f32) -> Self {
Self { Self {

2
sixtyfps_runtime/interpreter/eval.rs
View file

@ -209,7 +209,7 @@ pub fn eval_expression(
(Value::Number(n), Type::String) => { (Value::Number(n), Type::String) => {
Value::String(SharedString::from(format!("{}", n).as_str())) Value::String(SharedString::from(format!("{}", n).as_str()))
} }
(Value::Number(n), Type::Color) => Value::Color(Color::from(n as u32)), (Value::Number(n), Type::Color) => Value::Color(Color::from_argb_encoded(n as u32)),
(v, _) => v, (v, _) => v,
} }
} }