Supporting changes for text editing 1

Author: valadaptive

Cargo.lock

@@ -1518,6 +1518,7 @@ name = "epaint"
 version = "0.31.1"
 dependencies = [
  "ab_glyph",
+ "accesskit",
  "ahash",
  "backtrace",
  "bytemuck",
@@ -1667,8 +1668,6 @@ dependencies = [
 [[package]]
 name = "fontique"
 version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b5fcb214137f01bc842c4fd633236255c51f8a24c6d3923eb8361c6d0940737"
 dependencies = [
  "bytemuck",
  "fontconfig-cache-parser",
@@ -3089,12 +3088,12 @@ dependencies = [
 [[package]]
 name = "parley"
 version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d1c2b33b240c246f06cfceac48dc6c96040cb177d2aa5348899982b298b5577"
 dependencies = [
+ "accesskit",
  "fontique",
  "hashbrown 0.15.2",
  "peniko",
+ "serde",
  "skrifa",
  "swash",
 ]

crates/egui/Cargo.toml

@@ -28,7 +28,7 @@ default = ["default_fonts"]
 
 ## Exposes detailed accessibility implementation required by platform
 ## accessibility APIs. Also requires support in the egui integration.
-accesskit = ["dep:accesskit"]
+accesskit = ["dep:accesskit", "epaint/accesskit"]
 
 ## [`bytemuck`](https://docs.rs/bytemuck) enables you to cast [`epaint::Vertex`], [`emath::Vec2`] etc to `&[u8]`.
 bytemuck = ["epaint/bytemuck"]

crates/epaint/Cargo.toml

@@ -29,6 +29,8 @@ rustdoc-args = ["--generate-link-to-definition"]
 
 
 [features]
+accesskit = ["dep:accesskit", "parley/accesskit"]
+
 default = ["default_fonts"]
 
 ## [`bytemuck`](https://docs.rs/bytemuck) enables you to cast [`Vertex`] to `&[u8]`.
@@ -61,7 +63,7 @@ mint = ["emath/mint"]
 rayon = ["dep:rayon"]
 
 ## Allow serialization using [`serde`](https://docs.rs/serde).
-serde = ["dep:serde", "ahash/serde", "emath/serde", "ecolor/serde"]
+serde = ["dep:serde", "ahash/serde", "emath/serde", "ecolor/serde", "parley/serde"]
 
 ## Change Vertex layout to be compatible with unity
 unity = []
@@ -77,15 +79,18 @@ ecolor.workspace = true
 ab_glyph = "0.2.11"
 #cosmic-text = { git = "https://github.com/valadaptive/cosmic-text/", rev = "564b634" }
 #cosmic-text = { path = "../../../cosmic-text" }
-parley = { version = "0.3", features = ["system"] }
-#parley = { path = "../../../parley/parley", features = ["system"] }
+#parley = { version = "0.3", features = ["system"] }
+parley = { path = "../../../parley/parley", features = ["system"] }
 swash = { version = "0.2" }
 ahash.workspace = true
 nohash-hasher.workspace = true
 parking_lot.workspace = true   # Using parking_lot over std::sync::Mutex gives 50% speedups in some real-world scenarios.
 profiling = { workspace = true}
 
 #! ### Optional dependencies
+
+accesskit = { workspace = true, optional = true }
+
 bytemuck = { workspace = true, optional = true, features = ["derive"] }
 
 ## Enable this when generating docs.

crates/epaint/src/lib.rs

@@ -120,7 +120,7 @@ impl Default for TextureId {
 /// A [`Shape`] within a clip rectangle.
 ///
 /// Everything is using logical points.
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug)]
 pub struct ClippedShape {
     /// Clip / scissor rectangle.
     /// Only show the part of the [`Shape`] that falls within this.

crates/epaint/src/mutex.rs

@@ -9,7 +9,7 @@ mod mutex_impl {
     /// This is a thin wrapper around [`parking_lot::Mutex`], except if
     /// the feature `deadlock_detection` is turned enabled, in which case
     /// extra checks are added to detect deadlocks.
-    #[derive(Default)]
+    #[derive(Default, Debug)]
     pub struct Mutex<T>(parking_lot::Mutex<T>);
 
     /// The lock you get from [`Mutex`].
@@ -35,7 +35,7 @@ mod mutex_impl {
     /// This is a thin wrapper around [`parking_lot::Mutex`], except if
     /// the feature `deadlock_detection` is turned enabled, in which case
     /// extra checks are added to detect deadlocks.
-    #[derive(Default)]
+    #[derive(Default, Debug)]
     pub struct Mutex<T>(parking_lot::Mutex<T>);
 
     /// The lock you get from [`Mutex`].

crates/epaint/src/shapes/shape.rs

@@ -23,7 +23,7 @@ use super::{
 /// [`Shape::Text`] depends on the current `pixels_per_point` (dpi scale)
 /// and so must be recreated every time `pixels_per_point` changes.
 #[must_use = "Add a Shape to a Painter"]
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug)]
 pub enum Shape {
     /// Paint nothing. This can be useful as a placeholder.
     Noop,

crates/epaint/src/shapes/text_shape.rs

@@ -5,7 +5,7 @@ use crate::*;
 /// How to paint some text on screen.
 ///
 /// This needs to be recreated if `pixels_per_point` (dpi scale) changes.
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug)]
 #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
 pub struct TextShape {
     /// Top left corner of the first character.

crates/epaint/src/text/parley_layout.rs

@@ -7,6 +7,7 @@ use parley::{
 };
 
 use crate::{
+    mutex::Mutex,
     text::{Row, RowVisuals},
     Mesh,
 };
@@ -62,6 +63,9 @@ pub fn layout(fonts: &mut FontsImpl, job: LayoutJob) -> Galley {
         return Galley {
             job: Arc::new(job),
             rows: Default::default(),
+            parley_layout: Mutex::new(parley::Layout::new()),
+            #[cfg(feature = "accesskit")]
+            layout_access: Mutex::new(None),
             rect: Rect::from_min_max(Pos2::ZERO, Pos2::ZERO),
             mesh_bounds: Rect::NOTHING,
             num_vertices: 0,
@@ -280,6 +284,9 @@ pub fn layout(fonts: &mut FontsImpl, job: LayoutJob) -> Galley {
     Galley {
         job: Arc::new(job),
         rows,
+        parley_layout: Mutex::new(layout),
+        #[cfg(feature = "accesskit")]
+        layout_access: Mutex::new(None),
         elided: false,
         rect: acc_logical_bounds,
         mesh_bounds: acc_mesh_bounds,

crates/epaint/src/text/text_layout_types.rs

@@ -8,7 +8,7 @@ use super::{
     cursor::{CCursor, LayoutCursor},
     font::UvRect,
 };
-use crate::{Color32, FontId, Mesh, Stroke};
+use crate::{mutex::Mutex, Color32, FontId, Mesh, Stroke};
 use emath::{pos2, Align, NumExt, OrderedFloat, Pos2, Rect, Vec2};
 
 /// Describes the task of laying out text.
@@ -495,7 +495,7 @@ impl TextWrapping {
 ///
 /// The name comes from typography, where a "galley" is a metal tray
 /// containing a column of set type, usually the size of a page of text.
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone)]
 #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
 pub struct Galley {
     /// The job that this galley is the result of.
@@ -511,6 +511,15 @@ pub struct Galley {
     /// can be split up into multiple rows.
     pub rows: Vec<Row>,
 
+    // TODO: store position offset for hit testing
+    // This needs to be wrapped in a Mutex because Shape stores it and must be Send+Sync
+    #[cfg_attr(feature = "serde", serde(skip))]
+    pub(super) parley_layout: Mutex<parley::Layout<Color32>>,
+
+    #[cfg(feature = "accesskit")]
+    #[cfg_attr(feature = "serde", serde(skip))]
+    pub(super) layout_access: Mutex<Option<parley::LayoutAccessibility>>,
+
     /// Set to true the text was truncated due to [`TextWrapping::max_rows`].
     pub elided: bool,
 
@@ -541,6 +550,22 @@ pub struct Galley {
     pub pixels_per_point: f32,
 }
 
+// parley::Layout does not implement Debug
+impl std::fmt::Debug for Galley {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("Galley")
+            .field("job", &self.job)
+            .field("rows", &self.rows)
+            .field("elided", &self.elided)
+            .field("rect", &self.rect)
+            .field("mesh_bounds", &self.mesh_bounds)
+            .field("num_vertices", &self.num_vertices)
+            .field("num_indices", &self.num_indices)
+            .field("pixels_per_point", &self.pixels_per_point)
+            .finish()
+    }
+}
+
 #[derive(Clone, Debug, PartialEq)]
 #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
 pub struct Row {