Use palette and Color from top level Xilem and Masonry (#800)

masonry/examples/custom_widget.rs

@@ -14,15 +14,15 @@ use accesskit::{Node, Role};
 use masonry::kurbo::{BezPath, Stroke};
 use masonry::widget::{ObjectFit, RootWidget};
 use masonry::{
-    AccessCtx, AccessEvent, Action, Affine, AppDriver, BoxConstraints, Color, DriverCtx, EventCtx,
-    LayoutCtx, PaintCtx, Point, PointerEvent, QueryCtx, Rect, RegisterCtx, Size, TextEvent, Widget,
-    WidgetId,
+    palette, AccessCtx, AccessEvent, Action, Affine, AppDriver, BoxConstraints, Color, DriverCtx,
+    EventCtx, LayoutCtx, PaintCtx, Point, PointerEvent, QueryCtx, Rect, RegisterCtx, Size,
+    TextEvent, Widget, WidgetId,
 };
 use parley::layout::Alignment;
 use parley::style::{FontFamily, FontStack, StyleProperty};
 use smallvec::SmallVec;
 use tracing::{trace_span, Span};
-use vello::peniko::{color::palette, Fill, Image, ImageFormat};
+use vello::peniko::{Fill, Image, ImageFormat};
 use vello::Scene;
 use winit::window::Window;
 

masonry/src/contexts.rs

@@ -11,7 +11,6 @@ use parley::{FontContext, LayoutContext};
 use tracing::{trace, warn};
 use tree_arena::{ArenaMutChildren, ArenaRefChildren};
 use vello::kurbo::Vec2;
-use vello::peniko::Color;
 use winit::window::ResizeDirection;
 
 use crate::action::Action;
@@ -20,7 +19,9 @@ use crate::render_root::{MutateCallback, RenderRootSignal, RenderRootState};
 use crate::text::BrushIndex;
 use crate::theme::get_debug_color;
 use crate::widget::{WidgetMut, WidgetRef, WidgetState};
-use crate::{AllowRawMut, BoxConstraints, Insets, Point, Rect, Size, Widget, WidgetId, WidgetPod};
+use crate::{
+    AllowRawMut, BoxConstraints, Color, Insets, Point, Rect, Size, Widget, WidgetId, WidgetPod,
+};
 
 // Note - Most methods defined in this file revolve around `WidgetState` fields.
 // Consider reading `WidgetState` documentation (especially the documented naming scheme)

masonry/src/event_loop_runner.rs

@@ -7,7 +7,6 @@ use std::sync::Arc;
 use accesskit_winit::Adapter;
 use tracing::{debug, info_span, warn};
 use vello::kurbo::Affine;
-use vello::peniko::Color;
 use vello::util::{RenderContext, RenderSurface};
 use vello::{AaSupport, RenderParams, Renderer, RendererOptions, Scene};
 use wgpu::PresentMode;
@@ -24,7 +23,7 @@ use crate::app_driver::{AppDriver, DriverCtx};
 use crate::dpi::LogicalPosition;
 use crate::event::{PointerButton, PointerState, WindowEvent};
 use crate::render_root::{self, RenderRoot, WindowSizePolicy};
-use crate::{PointerEvent, TextEvent, Widget, WidgetId};
+use crate::{Color, PointerEvent, TextEvent, Widget, WidgetId};
 
 #[derive(Debug)]
 pub enum MasonryUserEvent {

masonry/src/lib.rs

@@ -178,7 +178,7 @@ pub use cursor_icon::{CursorIcon, ParseError as CursorIconParseError};
 pub use kurbo::{Affine, Insets, Point, Rect, Size, Vec2};
 pub use parley::layout::Alignment as TextAlignment;
 pub use parley::style::FontWeight;
-pub use vello::peniko::{Color, Gradient};
+pub use vello::peniko::{color::palette, Color, Gradient};
 
 pub use action::Action;
 pub use app_driver::{AppDriver, DriverCtx};

masonry/src/theme.rs

@@ -5,9 +5,7 @@
 
 #![allow(missing_docs)]
 
-use vello::peniko::Color;
-
-use crate::Insets;
+use crate::{Color, Insets};
 
 // Colors are from https://sashat.me/2017/01/11/list-of-20-simple-distinct-colors/
 // They're picked for visual distinction and accessibility (99 percent)

masonry/src/widget/sized_box.rs

@@ -574,13 +574,12 @@ impl Widget for SizedBox {
 #[cfg(test)]
 mod tests {
     use insta::assert_debug_snapshot;
-    use vello::peniko::color::palette;
     use vello::peniko::Gradient;
 
     use super::*;
-    use crate::assert_render_snapshot;
     use crate::testing::TestHarness;
     use crate::widget::Label;
+    use crate::{assert_render_snapshot, palette};
 
     // TODO - Add WidgetMut tests
 

masonry/src/widget/spinner.rs

@@ -153,9 +153,8 @@ impl Widget for Spinner {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::assert_render_snapshot;
     use crate::testing::TestHarness;
-    use crate::vello::peniko::color::palette;
+    use crate::{assert_render_snapshot, palette};
 
     #[test]
     fn simple_spinner() {

masonry/src/widget/text_area.rs

@@ -15,16 +15,16 @@ use parley::PlainEditor;
 use smallvec::SmallVec;
 use tracing::{trace_span, Span};
 use vello::kurbo::{Rect, Vec2};
-use vello::peniko::{color::palette, Brush, Fill};
+use vello::peniko::{Brush, Fill};
 use vello::Scene;
 use winit::keyboard::{Key, NamedKey};
 
 use crate::text::{BrushIndex, StyleProperty};
 use crate::widget::{Padding, WidgetMut};
 use crate::{
-    theme, AccessCtx, AccessEvent, BoxConstraints, CursorIcon, EventCtx, LayoutCtx, PaintCtx,
-    PointerButton, PointerEvent, QueryCtx, RegisterCtx, TextEvent, Update, UpdateCtx, Widget,
-    WidgetId,
+    palette, theme, AccessCtx, AccessEvent, BoxConstraints, CursorIcon, EventCtx, LayoutCtx,
+    PaintCtx, PointerButton, PointerEvent, QueryCtx, RegisterCtx, TextEvent, Update, UpdateCtx,
+    Widget, WidgetId,
 };
 
 /// `TextArea` implements the core of interactive text.
@@ -975,7 +975,7 @@ impl<const EDITABLE: bool> Widget for TextArea<EDITABLE> {
 
 #[cfg(test)]
 mod tests {
-    use vello::{kurbo::Size, peniko::color::palette};
+    use vello::kurbo::Size;
 
     use super::*;
     use crate::testing::TestHarness;

masonry/src/widget/textbox.rs

@@ -7,13 +7,12 @@ use accesskit::{Node, Role};
 use smallvec::{smallvec, SmallVec};
 use tracing::{trace_span, Span};
 use vello::kurbo::{Affine, Insets, Point, Rect, Size, Stroke};
-use vello::peniko::Color;
 use vello::Scene;
 
 use crate::widget::WidgetMut;
 use crate::{
-    AccessCtx, AccessEvent, BoxConstraints, EventCtx, LayoutCtx, PaintCtx, PointerEvent, QueryCtx,
-    RegisterCtx, TextEvent, Update, UpdateCtx, Widget, WidgetId,
+    AccessCtx, AccessEvent, BoxConstraints, Color, EventCtx, LayoutCtx, PaintCtx, PointerEvent,
+    QueryCtx, RegisterCtx, TextEvent, Update, UpdateCtx, Widget, WidgetId,
 };
 
 use super::{Padding, TextArea, WidgetPod};

xilem/examples/calc.rs

@@ -6,15 +6,14 @@
 #![expect(clippy::cast_possible_truncation, reason = "Deferred: Noisy")]
 
 use masonry::widget::{CrossAxisAlignment, GridParams, MainAxisAlignment};
-use vello::peniko::color::palette;
 use winit::dpi::LogicalSize;
 use winit::error::EventLoopError;
 use winit::window::Window;
 use xilem::view::{
     button, flex, grid, label, sized_box, Axis, Flex, FlexSequence, FlexSpacer, GridExt,
     GridSequence, Label,
 };
-use xilem::{EventLoop, EventLoopBuilder, WidgetView, Xilem};
+use xilem::{palette, EventLoop, EventLoopBuilder, WidgetView, Xilem};
 
 #[derive(Copy, Clone)]
 enum MathOperator {

xilem/examples/http_cats.rs

@@ -9,7 +9,6 @@
 
 use std::sync::Arc;
 
-use vello::peniko::color::palette;
 use vello::peniko::{Blob, Image};
 use winit::dpi::LogicalSize;
 use winit::error::EventLoopError;
@@ -20,7 +19,7 @@ use xilem::view::{
     button, flex, image, inline_prose, portal, prose, sized_box, spinner, worker, Axis, FlexExt,
     FlexSpacer, Padding,
 };
-use xilem::{EventLoop, EventLoopBuilder, TextAlignment, WidgetView, Xilem};
+use xilem::{palette, EventLoop, EventLoopBuilder, TextAlignment, WidgetView, Xilem};
 
 /// The main state of the application.
 struct HttpCats {

xilem/examples/mason.rs

@@ -9,15 +9,16 @@
 
 use std::time::Duration;
 
-use vello::peniko::color::palette;
 use winit::error::EventLoopError;
 use xilem::core::{fork, run_once};
 use xilem::tokio::time;
 use xilem::view::{
     button, button_any_pointer, checkbox, flex, label, prose, task, textbox, Axis, FlexExt as _,
     FlexSpacer,
 };
-use xilem::{Color, EventLoop, EventLoopBuilder, FontWeight, TextAlignment, WidgetView, Xilem};
+use xilem::{
+    palette, Color, EventLoop, EventLoopBuilder, FontWeight, TextAlignment, WidgetView, Xilem,
+};
 const LOREM: &str = r"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi cursus mi sed euismod euismod. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam placerat efficitur tellus at semper. Morbi ac risus magna. Donec ut cursus ex. Etiam quis posuere tellus. Mauris posuere dui et turpis mollis, vitae luctus tellus consectetur. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur eu facilisis nisl.
 
 Phasellus in viverra dolor, vitae facilisis est. Maecenas malesuada massa vel ultricies feugiat. Vivamus venenatis et nibh nec pharetra. Phasellus vestibulum elit enim, nec scelerisque orci faucibus id. Vivamus consequat purus sit amet orci egestas, non iaculis massa porttitor. Vestibulum ut eros leo. In fermentum convallis magna in finibus. Donec justo leo, maximus ac laoreet id, volutpat ut elit. Mauris sed leo non neque laoreet faucibus. Aliquam orci arcu, faucibus in molestie eget, ornare non dui. Donec volutpat nulla in fringilla elementum. Aliquam vitae ante egestas ligula tempus vestibulum sit amet sed ante. ";

xilem/examples/variable_clock.rs

@@ -9,14 +9,13 @@ use std::time::Duration;
 use time::error::IndeterminateOffset;
 use time::macros::format_description;
 use time::{OffsetDateTime, UtcOffset};
-use vello::peniko::color::palette;
 use winit::error::EventLoopError;
 use xilem::core::fork;
 use xilem::view::{
     button, flex, inline_prose, label, portal, prose, sized_box, task, variable_label, Axis,
     FlexExt, FlexSpacer,
 };
-use xilem::{EventLoop, EventLoopBuilder, FontWeight, WidgetView, Xilem};
+use xilem::{palette, EventLoop, EventLoopBuilder, FontWeight, WidgetView, Xilem};
 
 /// The state of the application, owned by Xilem and updated by the callbacks below.
 struct Clocks {

xilem/src/lib.rs

@@ -53,7 +53,7 @@ use crate::core::{
     ViewPathTracker, ViewSequence,
 };
 pub use masonry::event_loop_runner::{EventLoop, EventLoopBuilder};
-pub use masonry::{dpi, Color, FontWeight, TextAlignment};
+pub use masonry::{dpi, palette, Color, FontWeight, TextAlignment};
 pub use xilem_core as core;
 
 /// Tokio is the async runner used with Xilem.

xilem/src/view/sized_box.rs

@@ -92,7 +92,7 @@ impl<V, State, Action> SizedBox<V, State, Action> {
     /// This can be passed anything which can be represented by a [`Brush`];
     /// notably, it can be any [`Color`], any gradient, or an [`Image`].
     ///
-    /// [`Color`]: vello::peniko::Color
+    /// [`Color`]: crate::Color
     /// [`Image`]: vello::peniko::Image
     pub fn background(mut self, brush: impl Into<Brush>) -> Self {
         self.background = Some(brush.into());