1 files changed, 31 insertions, 28 deletions

diff --git a/examples/geometry/src/main.rs b/examples/geometry/src/main.rs
index 5cb41184..29f78ea1 100644
--- a/examples/geometry/src/main.rs
+++ b/examples/geometry/src/main.rs
@@ -3,12 +3,12 @@
 mod rainbow {
     use iced_graphics::primitive::{ColoredVertex2D, Primitive};
 
+    use iced::advanced::graphics::color;
     use iced::advanced::layout::{self, Layout};
     use iced::advanced::renderer;
     use iced::advanced::widget::{self, Widget};
-    use iced::{
-        Element, Length, Point, Rectangle, Renderer, Size, Theme, Vector,
-    };
+    use iced::mouse;
+    use iced::{Element, Length, Rectangle, Renderer, Size, Theme, Vector};
 
     #[derive(Debug, Clone, Copy, Default)]
     pub struct Rainbow;
@@ -43,13 +43,13 @@ mod rainbow {
             _theme: &Theme,
             _style: &renderer::Style,
             layout: Layout<'_>,
-            cursor_position: Point,
+            cursor: mouse::Cursor,
             _viewport: &Rectangle,
         ) {
             use iced::advanced::Renderer as _;
             use iced_graphics::primitive::Mesh2D;
 
-            let b = layout.bounds();
+            let bounds = layout.bounds();
 
             // R O Y G B I V
             let color_r = [1.0, 0.0, 0.0, 1.0];
@@ -62,61 +62,61 @@ mod rainbow {
             let color_v = [0.75, 0.0, 0.5, 1.0];
 
             let posn_center = {
-                if b.contains(cursor_position) {
-                    [cursor_position.x - b.x, cursor_position.y - b.y]
+                if let Some(cursor_position) = cursor.position_in(bounds) {
+                    [cursor_position.x, cursor_position.y]
                 } else {
-                    [b.width / 2.0, b.height / 2.0]
+                    [bounds.width / 2.0, bounds.height / 2.0]
                 }
             };
 
             let posn_tl = [0.0, 0.0];
-            let posn_t = [b.width / 2.0, 0.0];
-            let posn_tr = [b.width, 0.0];
-            let posn_r = [b.width, b.height / 2.0];
-            let posn_br = [b.width, b.height];
-            let posn_b = [(b.width / 2.0), b.height];
-            let posn_bl = [0.0, b.height];
-            let posn_l = [0.0, b.height / 2.0];
+            let posn_t = [bounds.width / 2.0, 0.0];
+            let posn_tr = [bounds.width, 0.0];
+            let posn_r = [bounds.width, bounds.height / 2.0];
+            let posn_br = [bounds.width, bounds.height];
+            let posn_b = [(bounds.width / 2.0), bounds.height];
+            let posn_bl = [0.0, bounds.height];
+            let posn_l = [0.0, bounds.height / 2.0];
 
             let mesh = Primitive::SolidMesh {
-                size: b.size(),
+                size: bounds.size(),
                 buffers: Mesh2D {
                     vertices: vec![
                         ColoredVertex2D {
                             position: posn_center,
-                            color: [1.0, 1.0, 1.0, 1.0],
+                            color: color::pack([1.0, 1.0, 1.0, 1.0]),
                         },
                         ColoredVertex2D {
                             position: posn_tl,
-                            color: color_r,
+                            color: color::pack(color_r),
                         },
                         ColoredVertex2D {
                             position: posn_t,
-                            color: color_o,
+                            color: color::pack(color_o),
                         },
                         ColoredVertex2D {
                             position: posn_tr,
-                            color: color_y,
+                            color: color::pack(color_y),
                         },
                         ColoredVertex2D {
                             position: posn_r,
-                            color: color_g,
+                            color: color::pack(color_g),
                         },
                         ColoredVertex2D {
                             position: posn_br,
-                            color: color_gb,
+                            color: color::pack(color_gb),
                         },
                         ColoredVertex2D {
                             position: posn_b,
-                            color: color_b,
+                            color: color::pack(color_b),
                         },
                         ColoredVertex2D {
                             position: posn_bl,
-                            color: color_i,
+                            color: color::pack(color_i),
                         },
                         ColoredVertex2D {
                             position: posn_l,
-                            color: color_v,
+                            color: color::pack(color_v),
                         },
                     ],
                     indices: vec![
@@ -132,9 +132,12 @@ mod rainbow {
                 },
             };
 
-            renderer.with_translation(Vector::new(b.x, b.y), |renderer| {
-                renderer.draw_primitive(mesh);
-            });
+            renderer.with_translation(
+                Vector::new(bounds.x, bounds.y),
+                |renderer| {
+                    renderer.draw_primitive(mesh);
+                },
+            );
         }
     }