Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

style: Make computed serialization of calc() match the spec too.

Browse source
This commit is contained in:
Emilio Cobos Álvarez 2017-08-18 10:05:10 +02:00
parent 1d54a8e857
commit 22d6a73436
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
1 changed files with 18 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

35
components/style/values/computed/length.rs
View file

@ -194,23 +194,24 @@ impl From<LengthOrPercentageOrNone> for Option<CalcLengthOrPercentage> {
impl ToCss for CalcLengthOrPercentage {
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
// FIXME(emilio): This should be consistent with specified calc().
//
// Also, serialisation here is kinda weird with negative percentages,
// for example, as of right now:
//
// calc(10px - 5%)
//
// would serialize as:
//
// calc(10px + -5%)
//
// Need to update and run through try.
match (self.length, self.percentage) {
(l, Some(p)) if l == Au(0) => p.to_css(dest),
(l, Some(p)) => write!(dest, "calc({}px + {}%)", Au::to_px(l), p.0 * 100.),
(l, None) => write!(dest, "{}px", Au::to_px(l)),
}
use num_traits::Zero;
let (length, percentage) = match (self.length, self.percentage) {
(l, None) => return l.to_css(dest),
(l, Some(p)) if l == Au(0) => return p.to_css(dest),
(l, Some(p)) => (l, p),
};
dest.write_str("calc(")?;
percentage.to_css(dest)?;
dest.write_str(if length < Zero::zero() { " - " } else { " + " })?;
// FIXME(emilio): Au::abs would be nice.
let length = if length < Zero::zero() { -length } else { length };
length.to_css(dest)?;
dest.write_str(")")
}
}