shadowfacts/grass
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Proper bounds for change-color rgba

Browse Source
This commit is contained in:
ConnorSkees 2020-02-16 22:35:02 -05:00
parent 5ee5f59b2c
commit 86a0e24330
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/builtin/color/other.rs
View File

@ -32,7 +32,7 @@ macro_rules! opt_arg {
Some(n / Number::from(100))
}
Value::Null => None,
_ => todo!(concat!("expected either unitless or % number for $", $arg)),
v => return Err(format!("${}: {} is not a number.", $arg, v).into()),
};
};
}
@ -48,10 +48,10 @@ pub(crate) fn register(f: &mut BTreeMap<String, Builtin>) {
v => return Err(format!("$color: {} is not a color.", v).into()),
};
opt_arg!(args, alpha, "alpha", -1, 1);
opt_arg!(args, red, "red", -255, 255);
opt_arg!(args, green, "green", -255, 255);
opt_arg!(args, blue, "blue", -255, 255);
opt_arg!(args, alpha, "alpha", 0, 1);
opt_arg!(args, red, "red", 0, 255);
opt_arg!(args, green, "green", 0, 255);
opt_arg!(args, blue, "blue", 0, 255);
if red.is_some() || green.is_some() || blue.is_some() {
return Ok(Value::Color(Color::from_rgba(red.unwrap_or(color.red()), green.unwrap_or(color.green()), blue.unwrap_or(color.blue()), alpha.unwrap_or(color.alpha()))))