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

`text::Shaping` strategy selection

1 files changed, 15 insertions, 1 deletions

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;