[librsvg/wip/dimensions-api: 4/11] Rename LengthUnit::Inch to LengthUnit::In
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg/wip/dimensions-api: 4/11] Rename LengthUnit::Inch to LengthUnit::In
- Date: Fri, 8 Feb 2019 01:38:16 +0000 (UTC)
commit b2154299f703c22dd60e1f459a26e708297364d1
Author: Federico Mena Quintero <federico gnome org>
Date: Wed Feb 6 17:03:35 2019 -0600
Rename LengthUnit::Inch to LengthUnit::In
rsvg_internals/src/font_props.rs | 14 +++++++-------
rsvg_internals/src/length.rs | 32 ++++++++++++++++----------------
2 files changed, 23 insertions(+), 23 deletions(-)
---
diff --git a/rsvg_internals/src/font_props.rs b/rsvg_internals/src/font_props.rs
index 85f2f822..6c7f354e 100644
--- a/rsvg_internals/src/font_props.rs
+++ b/rsvg_internals/src/font_props.rs
@@ -37,13 +37,13 @@ impl FontSizeSpec {
let new_size = match self {
FontSizeSpec::Smaller => LengthBoth::new(size.length() / 1.2, size.unit()),
FontSizeSpec::Larger => LengthBoth::new(size.length() * 1.2, size.unit()),
- FontSizeSpec::XXSmall => LengthBoth::new(compute_points(-3.0), LengthUnit::Inch),
- FontSizeSpec::XSmall => LengthBoth::new(compute_points(-2.0), LengthUnit::Inch),
- FontSizeSpec::Small => LengthBoth::new(compute_points(-1.0), LengthUnit::Inch),
- FontSizeSpec::Medium => LengthBoth::new(compute_points(0.0), LengthUnit::Inch),
- FontSizeSpec::Large => LengthBoth::new(compute_points(1.0), LengthUnit::Inch),
- FontSizeSpec::XLarge => LengthBoth::new(compute_points(2.0), LengthUnit::Inch),
- FontSizeSpec::XXLarge => LengthBoth::new(compute_points(3.0), LengthUnit::Inch),
+ FontSizeSpec::XXSmall => LengthBoth::new(compute_points(-3.0), LengthUnit::In),
+ FontSizeSpec::XSmall => LengthBoth::new(compute_points(-2.0), LengthUnit::In),
+ FontSizeSpec::Small => LengthBoth::new(compute_points(-1.0), LengthUnit::In),
+ FontSizeSpec::Medium => LengthBoth::new(compute_points(0.0), LengthUnit::In),
+ FontSizeSpec::Large => LengthBoth::new(compute_points(1.0), LengthUnit::In),
+ FontSizeSpec::XLarge => LengthBoth::new(compute_points(2.0), LengthUnit::In),
+ FontSizeSpec::XXLarge => LengthBoth::new(compute_points(3.0), LengthUnit::In),
FontSizeSpec::Value(s) if s.unit() == LengthUnit::Percent => {
LengthBoth::new(size.length() * s.length(), size.unit())
}
diff --git a/rsvg_internals/src/length.rs b/rsvg_internals/src/length.rs
index b43919ca..8b076a2d 100644
--- a/rsvg_internals/src/length.rs
+++ b/rsvg_internals/src/length.rs
@@ -13,7 +13,7 @@ pub enum LengthUnit {
Px,
Em,
Ex,
- Inch,
+ In,
}
#[derive(Debug, PartialEq, Copy, Clone)]
@@ -80,7 +80,7 @@ macro_rules! define_length_type {
self.length() * font_size_from_values(values, params) / 2.0
}
- LengthUnit::Inch => {
+ LengthUnit::In => {
self.length() * $dir.scaling_factor(params.dpi_x, params.dpi_y)
}
}
@@ -198,7 +198,7 @@ impl Length {
LengthUnit::Percent => self.length * width_or_height,
LengthUnit::Em => self.length * font_size,
LengthUnit::Ex => self.length * font_size / 2.0,
- LengthUnit::Inch => self.length * pixels_per_inch,
+ LengthUnit::In => self.length * pixels_per_inch,
}
}
@@ -239,27 +239,27 @@ impl Length {
"pt" => Length {
length: value / POINTS_PER_INCH,
- unit: LengthUnit::Inch,
+ unit: LengthUnit::In,
},
"in" => Length {
length: value,
- unit: LengthUnit::Inch,
+ unit: LengthUnit::In,
},
"cm" => Length {
length: value / CM_PER_INCH,
- unit: LengthUnit::Inch,
+ unit: LengthUnit::In,
},
"mm" => Length {
length: value / MM_PER_INCH,
- unit: LengthUnit::Inch,
+ unit: LengthUnit::In,
},
"pc" => Length {
length: value / PICA_PER_INCH,
- unit: LengthUnit::Inch,
+ unit: LengthUnit::In,
},
"px" => Length {
@@ -286,7 +286,7 @@ fn font_size_from_values(values: &ComputedValues, params: &ViewParams) -> f64 {
LengthUnit::Px => v.length,
// FontSize always is a LengthDir::Both, per properties.rs
- LengthUnit::Inch => v.length * LengthDir::Both.scaling_factor(params.dpi_x, params.dpi_y),
+ LengthUnit::In => v.length * LengthDir::Both.scaling_factor(params.dpi_x, params.dpi_y),
LengthUnit::Percent => unreachable!("ComputedValues can't have a relative font size"),
@@ -393,27 +393,27 @@ mod tests {
fn parses_physical_units() {
assert_eq!(
LengthBoth::parse_str("72pt"),
- Ok(LengthBoth(Length::new(1.0, LengthUnit::Inch,)))
+ Ok(LengthBoth(Length::new(1.0, LengthUnit::In)))
);
assert_eq!(
LengthBoth::parse_str("-22.5in"),
- Ok(LengthBoth(Length::new(-22.5, LengthUnit::Inch,)))
+ Ok(LengthBoth(Length::new(-22.5, LengthUnit::In)))
);
assert_eq!(
LengthBoth::parse_str("-254cm"),
- Ok(LengthBoth(Length::new(-100.0, LengthUnit::Inch,)))
+ Ok(LengthBoth(Length::new(-100.0, LengthUnit::In)))
);
assert_eq!(
LengthBoth::parse_str("254mm"),
- Ok(LengthBoth(Length::new(10.0, LengthUnit::Inch,)))
+ Ok(LengthBoth(Length::new(10.0, LengthUnit::In)))
);
assert_eq!(
LengthBoth::parse_str("60pc"),
- Ok(LengthBoth(Length::new(10.0, LengthUnit::Inch,)))
+ Ok(LengthBoth(Length::new(10.0, LengthUnit::In)))
);
}
@@ -456,11 +456,11 @@ mod tests {
let values = ComputedValues::default();
assert_approx_eq_cairo!(
- LengthHorizontal::new(10.0, LengthUnit::Inch).normalize(&values, ¶ms),
+ LengthHorizontal::new(10.0, LengthUnit::In).normalize(&values, ¶ms),
400.0
);
assert_approx_eq_cairo!(
- LengthVertical::new(10.0, LengthUnit::Inch).normalize(&values, ¶ms),
+ LengthVertical::new(10.0, LengthUnit::In).normalize(&values, ¶ms),
500.0
);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]