Merge pull request #1822 from iced-rs/basic-shaping

`text::Shaping` strategy selection

7 files changed, 30 insertions, 3 deletions

diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index 9f9bd066..6934ae49 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -44,7 +44,7 @@ path = "../graphics"
 [dependencies.glyphon]
 version = "0.2"
 git = "https://github.com/hecrj/glyphon.git"
-rev = "1d26d92b19407c5dabe4625944d4a6babbbf0715"
+rev = "504aa8a9a1fb42726f02fa244b70119e7ca25933"
 
 [dependencies.encase]
 version = "0.3.0"
diff --git a/wgpu/fonts/Iced-Icons.ttf b/wgpu/fonts/Iced-Icons.ttf
index 7112f086..e3273141 100644
--- a/wgpu/fonts/Iced-Icons.ttf
+++ b/wgpu/fonts/Iced-Icons.ttf
diff --git a/wgpu/src/backend.rs b/wgpu/src/backend.rs
index 9772781a..6b847aff 100644
--- a/wgpu/src/backend.rs
+++ b/wgpu/src/backend.rs
@@ -354,8 +354,10 @@ impl backend::Text for Backend {
         size: f32,
         font: Font,
         bounds: Size,
+        shaping: core::text::Shaping,
     ) -> (f32, f32) {
-        self.text_pipeline.measure(contents, size, font, bounds)
+        self.text_pipeline
+            .measure(contents, size, font, bounds, shaping)
     }
 
     fn hit_test(
@@ -364,6 +366,7 @@ impl backend::Text for Backend {
         size: f32,
         font: Font,
         bounds: Size,
+        shaping: core::text::Shaping,
         point: Point,
         nearest_only: bool,
     ) -> Option<core::text::Hit> {
@@ -372,6 +375,7 @@ impl backend::Text for Backend {
             size,
             font,
             bounds,
+            shaping,
             point,
             nearest_only,
         )
diff --git a/wgpu/src/geometry.rs b/wgpu/src/geometry.rs
index 59ec31fe..f6397ab7 100644
--- a/wgpu/src/geometry.rs
+++ b/wgpu/src/geometry.rs
@@ -334,6 +334,7 @@ impl Frame {
             font: text.font,
             horizontal_alignment: text.horizontal_alignment,
             vertical_alignment: text.vertical_alignment,
+            shaping: text.shaping,
         });
     }
 
diff --git a/wgpu/src/layer.rs b/wgpu/src/layer.rs
index c4723397..b9fd044e 100644
--- a/wgpu/src/layer.rs
+++ b/wgpu/src/layer.rs
@@ -10,6 +10,7 @@ pub use mesh::Mesh;
 pub use quad::Quad;
 pub use text::Text;
 
+use crate::core;
 use crate::core::alignment;
 use crate::core::{Background, Color, Font, Point, Rectangle, Size, Vector};
 use crate::graphics::{Primitive, Viewport};
@@ -64,6 +65,7 @@ impl<'a> Layer<'a> {
                 font: Font::MONOSPACE,
                 horizontal_alignment: alignment::Horizontal::Left,
                 vertical_alignment: alignment::Vertical::Top,
+                shaping: core::text::Shaping::Basic,
             };
 
             overlay.text.push(text);
@@ -116,6 +118,7 @@ impl<'a> Layer<'a> {
                 font,
                 horizontal_alignment,
                 vertical_alignment,
+                shaping,
             } => {
                 let layer = &mut layers[current_layer];
 
@@ -127,6 +130,7 @@ impl<'a> Layer<'a> {
                     font: *font,
                     horizontal_alignment: *horizontal_alignment,
                     vertical_alignment: *vertical_alignment,
+                    shaping: *shaping,
                 });
             }
             Primitive::Quad {
diff --git a/wgpu/src/layer/text.rs b/wgpu/src/layer/text.rs
index fdbdaafb..665f7188 100644
--- a/wgpu/src/layer/text.rs
+++ b/wgpu/src/layer/text.rs
@@ -1,4 +1,5 @@
 use crate::core::alignment;
+use crate::core::text;
 use crate::core::{Color, Font, Rectangle};
 
 /// A paragraph of text.
@@ -24,4 +25,7 @@ pub struct Text<'a> {
 
     /// The vertical alignment of the [`Text`].
     pub vertical_alignment: alignment::Vertical,
+
+    /// The shaping strategy of the text.
+    pub shaping: text::Shaping,
 }
diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index f01e0b42..ad7bdc8d 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -1,6 +1,6 @@
 use crate::core::alignment;
 use crate::core::font::{self, Font};
-use crate::core::text::Hit;
+use crate::core::text::{Hit, Shaping};
 use crate::core::{Point, Rectangle, Size};
 use crate::layer::Text;
 
@@ -83,6 +83,7 @@ impl Pipeline {
                             height: (section.bounds.height * scale_factor)
                                 .ceil(),
                         },
+                        shaping: section.shaping,
                     },
                 );
 
@@ -213,6 +214,7 @@ impl Pipeline {
         size: f32,
         font: Font,
         bounds: Size,
+        shaping: Shaping,
     ) -> (f32, f32) {
         let mut measurement_cache = self.measurement_cache.borrow_mut();
 
@@ -223,6 +225,7 @@ impl Pipeline {
                 size,
                 font,
                 bounds,
+                shaping,
             },
         );
 
@@ -242,6 +245,7 @@ impl Pipeline {
         size: f32,
         font: Font,
         bounds: Size,
+        shaping: Shaping,
         point: Point,
         _nearest_only: bool,
     ) -> Option<Hit> {
@@ -254,6 +258,7 @@ impl Pipeline {
                 size,
                 font,
                 bounds,
+                shaping,
             },
         );
 
@@ -306,6 +311,13 @@ fn to_stretch(stretch: font::Stretch) -> glyphon::Stretch {
     }
 }
 
+fn to_shaping(shaping: Shaping) -> glyphon::Shaping {
+    match shaping {
+        Shaping::Basic => glyphon::Shaping::Basic,
+        Shaping::Advanced => glyphon::Shaping::Advanced,
+    }
+}
+
 struct Cache {
     entries: FxHashMap<KeyHash, glyphon::Buffer>,
     recently_used: FxHashSet<KeyHash>,
@@ -364,6 +376,7 @@ impl Cache {
                     .family(to_family(key.font.family))
                     .weight(to_weight(key.font.weight))
                     .stretch(to_stretch(key.font.stretch)),
+                to_shaping(key.shaping),
             );
 
             let _ = entry.insert(buffer);
@@ -388,6 +401,7 @@ struct Key<'a> {
     size: f32,
     font: Font,
     bounds: Size,
+    shaping: Shaping,
 }
 
 type KeyHash = u64;