From 33b5a900197e2798a393d6d9a0834039666eddbb Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Wed, 19 Apr 2023 01:19:56 +0200
Subject: Make basic text shaping the default shaping strategy

---
 wgpu/src/backend.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'wgpu/src/backend.rs')

diff --git a/wgpu/src/backend.rs b/wgpu/src/backend.rs
index 9772781a..d09b2dba 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,
+        advanced_shape: bool,
     ) -> (f32, f32) {
-        self.text_pipeline.measure(contents, size, font, bounds)
+        self.text_pipeline
+            .measure(contents, size, font, bounds, advanced_shape)
     }
 
     fn hit_test(
@@ -366,6 +368,7 @@ impl backend::Text for Backend {
         bounds: Size,
         point: Point,
         nearest_only: bool,
+        advanced_shape: bool,
     ) -> Option<core::text::Hit> {
         self.text_pipeline.hit_test(
             contents,
@@ -374,6 +377,7 @@ impl backend::Text for Backend {
             bounds,
             point,
             nearest_only,
+            advanced_shape,
         )
     }
 
-- 
cgit 


From 4bd290afe7d81d9aaf7467b3ce91491f6600261a Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Wed, 19 Apr 2023 02:00:45 +0200
Subject: Introduce `text::Shaping` enum and replace magic boolean

---
 wgpu/src/backend.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'wgpu/src/backend.rs')

diff --git a/wgpu/src/backend.rs b/wgpu/src/backend.rs
index d09b2dba..6b847aff 100644
--- a/wgpu/src/backend.rs
+++ b/wgpu/src/backend.rs
@@ -354,10 +354,10 @@ impl backend::Text for Backend {
         size: f32,
         font: Font,
         bounds: Size,
-        advanced_shape: bool,
+        shaping: core::text::Shaping,
     ) -> (f32, f32) {
         self.text_pipeline
-            .measure(contents, size, font, bounds, advanced_shape)
+            .measure(contents, size, font, bounds, shaping)
     }
 
     fn hit_test(
@@ -366,18 +366,18 @@ impl backend::Text for Backend {
         size: f32,
         font: Font,
         bounds: Size,
+        shaping: core::text::Shaping,
         point: Point,
         nearest_only: bool,
-        advanced_shape: bool,
     ) -> Option<core::text::Hit> {
         self.text_pipeline.hit_test(
             contents,
             size,
             font,
             bounds,
+            shaping,
             point,
             nearest_only,
-            advanced_shape,
         )
     }
 
-- 
cgit