me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed import issue with canvas in the gradient mod for situations where canvas feature is not enabled.

Browse source
This commit is contained in:
shan 2022-10-07 16:28:13 -07:00
parent 215e6c95be
commit a4a1262fa2
5 changed files with 27 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

15
graphics/src/widget/canvas/fill.rs
View file

@ -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)
}
}
}

3
graphics/src/widget/canvas/frame.rs
View file

@ -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
}
}

6
graphics/src/widget/canvas/stroke.rs
View file

@ -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)
}
}
}