Update to latest Parley version. (#953)

xStrom · web-flow · commit 7d423cb40349 · 2025-05-08T10:40:51.000Z
This is basically the upcoming Parley 0.4.0, but right now pointing towards the latest git rev. The snapshots have changed because line height layout code improved in Parley. Fixes #933 Closes #936
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -92,20 +92,20 @@ tree_arena = { version = "0.1.0", path = "tree_arena" }
 vello = "0.4.0"
 wgpu = "23.0.1"
 kurbo = "0.11.1"
-parley = { git = "https://github.com/linebender/parley", rev = "eabfb8175848183dde2516d562c6b7eab7f0df84", features = [
+parley = { git = "https://github.com/linebender/parley", rev = "4977a349eb5e5ad276e850825ff87e7b7b709d52", features = [
     "accesskit",
 ] }
-peniko = "0.3.1"
-winit = "0.30.9"
+peniko = "0.3.2"
+winit = "0.30.10"
 tracing = { version = "0.1.40", default-features = false }
 smallvec = "1.13.2"
-hashbrown = "0.15.2"
+hashbrown = "0.15.3"
 dpi = "0.1.1"
 image = { version = "0.25.2", default-features = false }
 web-time = "1.1.0"
 bitflags = "2.6.0"
-accesskit = "0.18.0"
-accesskit_winit = "0.25.0"
+accesskit = "0.19.0"
+accesskit_winit = "0.27.0"
 time = "0.3.36"
 
 [profile.ci]
diff --git a/masonry/examples/custom_widget.rs b/masonry/examples/custom_widget.rs
@@ -129,7 +129,7 @@ impl Widget for CustomWidget {
 
         // To render text, we first create a LayoutBuilder and set the text properties.
         let mut lcx = parley::LayoutContext::new();
-        let mut text_layout_builder = lcx.ranged_builder(ctx.text_contexts().0, &self.0, 1.0);
+        let mut text_layout_builder = lcx.ranged_builder(ctx.text_contexts().0, &self.0, 1.0, true);
 
         text_layout_builder.push_default(StyleProperty::FontStack(FontStack::Single(
             FontFamily::Generic(parley::style::GenericFamily::Serif),
diff --git a/masonry/screenshots/example_calc_masonry_initial.png b/masonry/screenshots/example_calc_masonry_initial.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:63fd5c557c3cd8575e3e34678aa36408385c53d401708c390574de30c91bc6c1
-size 11107
+oid sha256:f7b9774b19781d64d6bbd4faa67bb136b899fb70661fe2574207a48313950355
+size 6103
diff --git a/masonry/screenshots/example_grid_masonry_initial.png b/masonry/screenshots/example_grid_masonry_initial.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4fb1e0aad3dc074028a723304a04af836d4496a547bc6377acd4f0ea4caeaacd
-size 17713
+oid sha256:c4bdc6ed0d16ab941fdbf3ac089119d82f8bbb85ca69670bd5446379224bece9
+size 17746
diff --git a/masonry_core/screenshots/prose_alignment_flex.png b/masonry_core/screenshots/prose_alignment_flex.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7e5182d941a3be69f634a39cf97625e734fcf4e4c7ca0d3e5c505eb5029c043e
-size 1137
+oid sha256:3040d971481e6fec69744783e9744dbc82ee1e5767f6c0f3e151fd36d3b3d92e
+size 1134
diff --git a/masonry_core/screenshots/textbox_outline.png b/masonry_core/screenshots/textbox_outline.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d1b66b9135f40393a67bdc84e03df22d4fff994ce9a0034fd465dbd4327d83da
-size 1429
+oid sha256:ef9f2879c28bb2718470bab4f41caf32a5552ae94f402e6b8fc550db35b6aec5
+size 1431
diff --git a/masonry_core/screenshots/textbox_selection.png b/masonry_core/screenshots/textbox_selection.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3a276946962c366ab4508baf08e71d746c8ffd5923d8953e4895c70b7af82c23
-size 1584
+oid sha256:c9614ac6458af2dc3385bb657dbd13cc99f6ccd16a5dba2a732812d511901d9a
+size 1583
diff --git a/masonry_core/screenshots/virtual_scroll_basic.png b/masonry_core/screenshots/virtual_scroll_basic.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e046e98457a12cee9128560232cd8778ecfd86289ea76ac03d04683332d5cfd3
-size 1465
+oid sha256:ee278e0d45902b31037400993741da8f6ee7bd1760f81aac7d7b23e62c109fa2
+size 1555
diff --git a/masonry_core/screenshots/virtual_scroll_limited_up_bottom.png b/masonry_core/screenshots/virtual_scroll_limited_up_bottom.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ecb40fb682d66737f40db36ce2c8f9ca4fe9e3bb3e6683db3e6db675337d630a
-size 612
+oid sha256:d6f23310ee20640233ef2450cd00cad125d6f256c4812f87938212ac5278e6fa
+size 606
diff --git a/masonry_core/screenshots/virtual_scroll_moved.png b/masonry_core/screenshots/virtual_scroll_moved.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6dac8b5e64c1843e669c4f5d3dd2297f9668a91b49c759af148e7a4e970b96e1
-size 2049
+oid sha256:b084fed1b9ccc9a3a5e05ad0193b8537a11b56f6391b322b1d05f3e952e28bd4
+size 2110
diff --git a/masonry_core/screenshots/virtual_scroll_scrolled.png b/masonry_core/screenshots/virtual_scroll_scrolled.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ee3e308e1a6fb34a6fe3b5482abf2ae492f4017937fbaf1ec969bc7100f9003b
-size 2879
+oid sha256:105a926fa430d7a0ae4d0b34b34124922409b46ce9b3b3ab99a3985b1c04284c
+size 2894
diff --git a/masonry_core/src/widgets/label.rs b/masonry_core/src/widgets/label.rs
@@ -379,7 +379,7 @@ impl Widget for Label {
         if self.styles_changed {
             let (font_ctx, layout_ctx) = ctx.text_contexts();
             // TODO: Should we use a different scale?
-            let mut builder = layout_ctx.ranged_builder(font_ctx, &self.text, 1.0);
+            let mut builder = layout_ctx.ranged_builder(font_ctx, &self.text, 1.0, true);
             for prop in self.styles.inner().values() {
                 builder.push_default(prop.to_owned());
             }
diff --git a/masonry_core/src/widgets/text_area.rs b/masonry_core/src/widgets/text_area.rs
@@ -952,7 +952,7 @@ impl<const EDITABLE: bool> Widget for TextArea<EDITABLE> {
         let origin = Vec2::new(self.padding.get_left(is_rtl), self.padding.top);
         let transform = Affine::translate(origin);
         if ctx.is_focus_target() {
-            for rect in self.editor.selection_geometry().iter() {
+            for (rect, _) in self.editor.selection_geometry().iter() {
                 // TODO: If window not focused, use a different color
                 // TODO: Make configurable
                 scene.fill(

Original file line number	Diff line number	Diff line change
`@@ -379,7 +379,7 @@ impl Widget for Label {`
`379`	`379`	`if self.styles_changed {`
`380`	`380`	`let (font_ctx, layout_ctx) = ctx.text_contexts();`
`381`	`381`	`// TODO: Should we use a different scale?`
`382`		`- let mut builder = layout_ctx.ranged_builder(font_ctx, &self.text, 1.0);`
	`382`	`+ let mut builder = layout_ctx.ranged_builder(font_ctx, &self.text, 1.0, true);`
`383`	`383`	`for prop in self.styles.inner().values() {`
`384`	`384`	`builder.push_default(prop.to_owned());`
`385`	`385`	`}`