[librsvg] NodeMask: separate the functions to get the default x/y/width/height
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg] NodeMask: separate the functions to get the default x/y/width/height
- Date: Tue, 22 Jan 2019 01:48:01 +0000 (UTC)
commit 9fbf0fd574a67c7d6c94a6ca52b8c4d6fcf657fc
Author: Federico Mena Quintero <federico gnome org>
Date: Mon Jan 21 13:07:21 2019 -0600
NodeMask: separate the functions to get the default x/y/width/height
I'll try to remove the Data associated type from the Parse trait; this
means removing LengthDir as a public concept.
rsvg_internals/src/mask.rs | 28 ++++++++++++++++++++--------
1 file changed, 20 insertions(+), 8 deletions(-)
---
diff --git a/rsvg_internals/src/mask.rs b/rsvg_internals/src/mask.rs
index 6ea3d62a..86dda588 100644
--- a/rsvg_internals/src/mask.rs
+++ b/rsvg_internals/src/mask.rs
@@ -35,23 +35,35 @@ pub struct NodeMask {
impl NodeMask {
pub fn new() -> NodeMask {
NodeMask {
- x: Cell::new(NodeMask::get_default_pos(LengthDir::Horizontal)),
- y: Cell::new(NodeMask::get_default_pos(LengthDir::Vertical)),
+ x: Cell::new(Self::default_x()),
+ y: Cell::new(Self::default_y()),
- width: Cell::new(NodeMask::get_default_size(LengthDir::Horizontal)),
- height: Cell::new(NodeMask::get_default_size(LengthDir::Vertical)),
+ width: Cell::new(Self::default_width()),
+ height: Cell::new(Self::default_height()),
units: Cell::new(MaskUnits::default()),
content_units: Cell::new(MaskContentUnits::default()),
}
}
- fn get_default_pos(dir: LengthDir) -> Length {
- Length::parse_str("-10%", dir).unwrap()
+ fn default_x() -> Length {
+ // per the spec
+ Length::parse_str("-10%", LengthDir::Horizontal).unwrap()
}
- fn get_default_size(dir: LengthDir) -> Length {
- Length::parse_str("120%", dir).unwrap()
+ fn default_y() -> Length {
+ // per the spec
+ Length::parse_str("-10%", LengthDir::Vertical).unwrap()
+ }
+
+ fn default_width() -> Length {
+ // per the spec
+ Length::parse_str("120%", LengthDir::Horizontal).unwrap()
+ }
+
+ fn default_height() -> Length {
+ // per the spec
+ Length::parse_str("120%", LengthDir::Vertical).unwrap()
}
pub fn generate_cairo_mask(
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]