summaryrefslogtreecommitdiffstats
path: root/graphics/src/widget
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/src/widget')
-rw-r--r--graphics/src/widget/canvas/fill.rs15
-rw-r--r--graphics/src/widget/canvas/frame.rs3
-rw-r--r--graphics/src/widget/canvas/stroke.rs6
3 files changed, 20 insertions, 4 deletions
diff --git a/graphics/src/widget/canvas/fill.rs b/graphics/src/widget/canvas/fill.rs
index cd56aa9e..477a7020 100644
--- a/graphics/src/widget/canvas/fill.rs
+++ b/graphics/src/widget/canvas/fill.rs
@@ -42,6 +42,15 @@ impl<'a> From<Color> for Fill<'a> {
}
}
+impl<'a> Into<Fill<'a>> for &'a Gradient {
+ fn into(self) -> Fill<'a> {
+ Fill {
+ style: Style::Gradient(self),
+ ..Default::default()
+ }
+ }
+}
+
/// The style of a [`Fill`].
#[derive(Debug, Clone)]
pub enum Style<'a> {
@@ -59,7 +68,11 @@ impl<'a> Style<'a> {
mesh::Style::Solid(*color)
},
Style::Gradient(gradient) => {
- mesh::Style::Gradient((*gradient).clone().transform(transform))
+ let mut gradient = (*gradient).clone();
+ let coordinates = gradient.coords();
+ transform.transform_point(coordinates.0);
+ transform.transform_point(coordinates.1);
+ mesh::Style::Gradient(gradient)
}
}
}
diff --git a/graphics/src/widget/canvas/frame.rs b/graphics/src/widget/canvas/frame.rs
index 6dd0d06a..d505cef7 100644
--- a/graphics/src/widget/canvas/frame.rs
+++ b/graphics/src/widget/canvas/frame.rs
@@ -38,12 +38,11 @@ pub(crate) struct Transform {
impl Transform {
/// Transforms the given [Point] by the transformation matrix.
- pub(crate) fn transform_point(&self, mut point: Point) -> Point {
+ pub(crate) fn transform_point(&self, point: &mut Point) {
let transformed =
self.raw.transform_point(Point2D::new(point.x, point.y));
point.x = transformed.x;
point.y = transformed.y;
- point
}
}
diff --git a/graphics/src/widget/canvas/stroke.rs b/graphics/src/widget/canvas/stroke.rs
index 5cb63a91..6e49f994 100644
--- a/graphics/src/widget/canvas/stroke.rs
+++ b/graphics/src/widget/canvas/stroke.rs
@@ -77,7 +77,11 @@ impl<'a> Style<'a> {
mesh::Style::Solid(*color)
},
Style::Gradient(gradient) => {
- mesh::Style::Gradient((*gradient).clone().transform(transform))
+ let mut gradient = (*gradient).clone();
+ let coordinates = gradient.coords();
+ transform.transform_point(coordinates.0);
+ transform.transform_point(coordinates.1);
+ mesh::Style::Gradient(gradient)
}
}
}