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

examples/solar_system/src/main.rs

@@ -11,7 +11,7 @@ use iced::executor;
 use iced::theme::{self, Theme};
 use iced::time;
 use iced::widget::canvas;
-use iced::widget::canvas::{Cursor, Path, Stroke, Fill, fill, Gradient, stroke, gradient::Position};
+use iced::widget::canvas::{Cursor, Path, Stroke, Gradient, stroke, gradient::Position};
 use iced::window;
 use iced::{
     Application, Color, Command, Element, Length, Point, Rectangle, Settings,
@@ -212,13 +212,7 @@ impl<Message> canvas::Program<Message> for State {
                 .build()
                 .unwrap();
 
-                frame.fill(
-                    &earth,
-                    Fill {
-                        style: fill::Style::Gradient(&earth_fill),
-                        ..Default::default()
-                    },
-                );
+                frame.fill(&earth, &earth_fill);
 
                 frame.with_save(|frame| {
                     frame.rotate(rotation * 10.0);

graphics/src/gradient.rs

@@ -1,10 +1,8 @@
 //! For creating a Gradient.
 mod linear;
 
-pub use crate::gradient::linear::{Linear, Position, Location};
-use crate::widget::canvas::frame::Transform;
-use crate::Color;
-use crate::widget::canvas::{Fill, fill};
+pub use crate::gradient::linear::{Linear, Location, Position};
+use crate::{Color, Point};
 
 #[derive(Debug, Clone, PartialEq)]
 /// A fill which transitions colors progressively along a direction, either linearly, radially (TBD),
@@ -30,23 +28,9 @@ impl Gradient {
         linear::Builder::new(position.into())
     }
 
-    /// Modifies the start & end stops of the gradient to have a proper transform value.
-    pub(crate) fn transform(mut self, transform: &Transform) -> Self {
-        match &mut self {
-            Gradient::Linear(linear) => {
-                linear.start = transform.transform_point(linear.start);
-                linear.end = transform.transform_point(linear.end);
-            }
-        }
-        self
-    }
-}
-
-impl<'a> Into<Fill<'a>> for &'a Gradient {
-    fn into(self) -> Fill<'a> {
-        Fill {
-            style: fill::Style::Gradient(self),
-            .. Default::default()
+    pub(crate) fn coords(&mut self) -> (&mut Point, &mut Point) {
+        match self {
+            Gradient::Linear(gradient) => (&mut gradient.start, &mut gradient.end)
         }
     }
 }

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

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

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