diff --git a/src/app.rs b/src/app.rs index 15af8cbc02..5b47d6bc9a 100644 --- a/src/app.rs +++ b/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}; diff --git a/src/app_main.rs b/src/app_main.rs index 9e43d28eac..2b76fa7c66 100644 --- a/src/app_main.rs +++ b/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, diff --git a/src/widget/button.rs b/src/widget/button.rs index 30873af8ab..d7b041a1e5 100644 --- a/src/widget/button.rs +++ b/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, }; diff --git a/src/widget/contexts.rs b/src/widget/contexts.rs index d5e6e2ed14..62eb01dcba 100644 --- a/src/widget/contexts.rs +++ b/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; diff --git a/src/widget/core.rs b/src/widget/core.rs index ce776d790c..d25da36f03 100644 --- a/src/widget/core.rs +++ b/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}; diff --git a/src/widget/piet_scene_helpers.rs b/src/widget/piet_scene_helpers.rs index 9fdda4f342..c3acaf8507 100644 --- a/src/widget/piet_scene_helpers.rs +++ b/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; diff --git a/src/widget/raw_event.rs b/src/widget/raw_event.rs index fcb3af8b6c..c49a19a68a 100644 --- a/src/widget/raw_event.rs +++ b/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 { diff --git a/src/widget/text.rs b/src/widget/text.rs index fb11bd343f..aab65f673f 100644 --- a/src/widget/text.rs +++ b/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, }; diff --git a/src/widget/widget.rs b/src/widget/widget.rs index 88e31a8ad5..4f7b2f2882 100644 --- a/src/widget/widget.rs +++ b/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;