Text handling refactor

Cargo.toml

@@ -107,7 +107,7 @@ xilem_core = { version = "0.1.0", path = "xilem_core" }
 vello = "0.2.1"
 wgpu = "0.20.1"
 kurbo = "0.11.0"
-parley = "0.1.0"
+parley = { version = "0.1.0", git = "https://github.com/linebender/parley", branch = "main" }
 peniko = "0.1.1"
 winit = "0.30.4"
 tracing = { version = "0.1.40", default-features = false }

masonry/examples/custom_widget.rs

@@ -109,12 +109,13 @@ impl Widget for CustomWidget {
         text_layout_builder.push_default(&StyleProperty::FontSize(24.0));
         text_layout_builder.push_default(&StyleProperty::Brush(Brush::Solid(fill_color).into()));
 
-        let mut text_layout = text_layout_builder.build();
-        text_layout.break_all_lines(None, Alignment::Start);
+        let mut text_layout = text_layout_builder.build(&self.0);
+        text_layout.break_all_lines(None);
+        text_layout.align(None, Alignment::Start);
 
         let mut scratch_scene = Scene::new();
         // We can pass a transform matrix to rotate the text we render
-        masonry::text_helpers::render_text(
+        masonry::text::render_text(
             scene,
             &mut scratch_scene,
             Affine::rotate(std::f64::consts::FRAC_PI_4).then_translate((80.0, 40.0).into()),

masonry/src/contexts.rs

@@ -14,7 +14,6 @@ use crate::action::Action;
 use crate::passes::layout::run_layout_on;
 use crate::render_root::{MutateCallback, RenderRootSignal, RenderRootState};
 use crate::text::TextBrush;
-use crate::text_helpers::ImeChangeSignal;
 use crate::tree_arena::{ArenaMutChildren, ArenaRefChildren};
 use crate::widget::{WidgetMut, WidgetRef, WidgetState};
 use crate::{
@@ -550,16 +549,6 @@ impl_context_method!(MutateCtx<'_>, EventCtx<'_>, LifeCycleCtx<'_>, {
         self.widget_state.needs_update_disabled = true;
         self.widget_state.is_explicitly_disabled = disabled;
     }
-
-    #[allow(unused)]
-    /// Indicate that text input state has changed.
-    ///
-    /// A widget that accepts text input should call this anytime input state
-    /// (such as the text or the selection) changes as a result of a non text-input
-    /// event.
-    pub fn invalidate_text_input(&mut self, event: ImeChangeSignal) {
-        todo!("invalidate_text_input");
-    }
 });
 
 // --- MARK: OTHER METHODS ---

masonry/src/lib.rs

@@ -119,8 +119,6 @@ mod event;
 pub mod paint_scene_helpers;
 pub mod render_root;
 pub mod testing;
-// mod text;
-pub mod text_helpers;
 pub mod theme;
 pub mod widget;
 
@@ -151,4 +149,4 @@ pub use vello::peniko::{Color, Gradient};
 pub use widget::widget::{AllowRawMut, Widget, WidgetId};
 pub use widget::{WidgetPod, WidgetState};
 
-pub use text_helpers::ArcStr;
+pub use text::ArcStr;