Allow .darker and .brighter on Brush

This commit is contained in:
Olivier Goffart 2022-04-12 10:07:56 +02:00 committed by Olivier Goffart
parent c825eee228
commit 54a6cb22ee
8 changed files with 113 additions and 15 deletions

View file

@ -109,12 +109,12 @@ impl BuiltinFunction {
args: vec![Type::ElementReference],
},
BuiltinFunction::ColorBrighter => Type::Function {
return_type: Box::new(Type::Color),
args: vec![Type::Color, Type::Float32],
return_type: Box::new(Type::Brush),
args: vec![Type::Brush, Type::Float32],
},
BuiltinFunction::ColorDarker => Type::Function {
return_type: Box::new(Type::Color),
args: vec![Type::Color, Type::Float32],
return_type: Box::new(Type::Brush),
args: vec![Type::Brush, Type::Float32],
},
BuiltinFunction::ImageSize => Type::Function {
return_type: Box::new(Type::Struct {

View file

@ -635,7 +635,7 @@ impl LookupObject for Expression {
}
Type::Component(c) => c.root_element.for_each_entry(ctx, f),
Type::String => StringExpression(self).for_each_entry(ctx, f),
Type::Color => ColorExpression(self).for_each_entry(ctx, f),
Type::Brush | Type::Color => ColorExpression(self).for_each_entry(ctx, f),
Type::Image => ImageExpression(self).for_each_entry(ctx, f),
Type::Array(_) => ArrayExpression(self).for_each_entry(ctx, f),
_ => None,
@ -655,7 +655,7 @@ impl LookupObject for Expression {
}),
Type::Component(c) => c.root_element.lookup(ctx, name),
Type::String => StringExpression(self).lookup(ctx, name),
Type::Color => ColorExpression(self).lookup(ctx, name),
Type::Brush | Type::Color => ColorExpression(self).lookup(ctx, name),
Type::Image => ImageExpression(self).lookup(ctx, name),
Type::Array(_) => ArrayExpression(self).lookup(ctx, name),
_ => None,