Import kurbo via vello, not glazier.

src/app.rs

@@ -17,11 +17,10 @@ use std::sync::{Arc, Mutex};
 use std::time::Duration;
 
 use accesskit::TreeUpdate;
-use glazier::kurbo::Size;
 use glazier::{IdleHandle, IdleToken, WindowHandle};
 use parley::FontContext;
 use tokio::runtime::Runtime;
-use vello::kurbo::{Point, Rect};
+use vello::kurbo::{Point, Rect, Size};
 use vello::SceneFragment;
 use xilem_core::{AsyncWake, MessageResult};
 

src/app_main.rs

@@ -16,12 +16,12 @@ use std::any::Any;
 
 use accesskit::TreeUpdate;
 use glazier::{
-    kurbo::{Affine, Size},
     Application, Cursor, HotKey, IdleToken, Menu, MouseEvent, Region, Scalable, SysMods,
     WinHandler, WindowBuilder, WindowHandle,
 };
 use parley::FontContext;
 use vello::{
+    kurbo::{Affine, Size},
     peniko::Color,
     util::{RenderContext, RenderSurface},
     RenderParams, Renderer, RendererOptions,

src/widget/button.rs

@@ -14,9 +14,9 @@
 
 use std::ops::Deref;
 
-use glazier::kurbo::{Affine, Insets, Size};
 use parley::Layout;
 use vello::{
+    kurbo::{Affine, Insets, Size},
     peniko::{Brush, Color},
     SceneBuilder,
 };

src/widget/contexts.rs

@@ -18,12 +18,9 @@
 //! widget system, particularly its contexts.rs.
 
 use accesskit::TreeUpdate;
-use glazier::kurbo::Point;
-use glazier::{
-    kurbo::{Rect, Size},
-    WindowHandle,
-};
+use glazier::WindowHandle;
 use parley::FontContext;
+use vello::kurbo::{Point, Rect, Size};
 
 use super::{PodFlags, WidgetState};
 use crate::Message;

src/widget/core.rs

@@ -18,8 +18,7 @@
 //! widget system, particularly its core.rs.
 
 use bitflags::bitflags;
-use glazier::kurbo::{Point, Rect, Size};
-use vello::kurbo::Affine;
+use vello::kurbo::{Affine, Point, Rect, Size};
 use vello::{SceneBuilder, SceneFragment};
 
 use super::widget::{AnyWidget, Widget};

src/widget/piet_scene_helpers.rs

@@ -1,4 +1,4 @@
-use glazier::kurbo::{self, Affine, Rect, Shape};
+use vello::kurbo::{self, Affine, Rect, Shape};
 use vello::peniko::{BrushRef, ColorStopsSource, Fill, Gradient, Stroke};
 use vello::SceneBuilder;
 

src/widget/raw_event.rs

@@ -17,11 +17,8 @@
 //! Note: arguably this module should be renamed, perhaps we should use
 //! "event" for this level and maybe "message" at the View level.
 
-use glazier::{
-    kurbo::{Point, Vec2},
-    Modifiers, MouseButton, MouseButtons,
-};
-use vello::kurbo::Rect;
+use glazier::{Modifiers, MouseButton, MouseButtons};
+use vello::kurbo::{Point, Rect, Vec2};
 
 #[derive(Debug, Clone)]
 pub enum Event {

src/widget/text.rs

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use glazier::kurbo::{Affine, Point, Size};
 use parley::Layout;
 use vello::{
+    kurbo::{Affine, Point, Size},
     peniko::{Brush, Color},
     SceneBuilder, SceneFragment,
 };

src/widget/widget.rs

@@ -16,7 +16,7 @@ use std::any::Any;
 use std::ops::DerefMut;
 
 use crate::geometry::Axis;
-use glazier::kurbo::Size;
+use vello::kurbo::Size;
 use vello::SceneBuilder;
 
 use super::box_constraints::BoxConstraints;