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

---
 renderer/src/backend.rs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'renderer/src')

diff --git a/renderer/src/backend.rs b/renderer/src/backend.rs
index 120dd644..a98e2479 100644
--- a/renderer/src/backend.rs
+++ b/renderer/src/backend.rs
@@ -48,8 +48,13 @@ impl backend::Text for Backend {
         size: f32,
         font: Font,
         bounds: Size,
+        advanced_shape: bool,
     ) -> (f32, f32) {
-        delegate!(self, backend, backend.measure(contents, size, font, bounds))
+        delegate!(
+            self,
+            backend,
+            backend.measure(contents, size, font, bounds, advanced_shape)
+        )
     }
 
     fn hit_test(
@@ -60,6 +65,7 @@ impl backend::Text for Backend {
         bounds: Size,
         position: Point,
         nearest_only: bool,
+        advanced_shape: bool,
     ) -> Option<text::Hit> {
         delegate!(
             self,
@@ -70,7 +76,8 @@ impl backend::Text for Backend {
                 font,
                 bounds,
                 position,
-                nearest_only
+                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

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

(limited to 'renderer/src')

diff --git a/renderer/src/backend.rs b/renderer/src/backend.rs
index a98e2479..70b146f4 100644
--- a/renderer/src/backend.rs
+++ b/renderer/src/backend.rs
@@ -48,12 +48,12 @@ impl backend::Text for Backend {
         size: f32,
         font: Font,
         bounds: Size,
-        advanced_shape: bool,
+        shaping: text::Shaping,
     ) -> (f32, f32) {
         delegate!(
             self,
             backend,
-            backend.measure(contents, size, font, bounds, advanced_shape)
+            backend.measure(contents, size, font, bounds, shaping)
         )
     }
 
@@ -63,9 +63,9 @@ impl backend::Text for Backend {
         size: f32,
         font: Font,
         bounds: Size,
+        shaping: text::Shaping,
         position: Point,
         nearest_only: bool,
-        advanced_shape: bool,
     ) -> Option<text::Hit> {
         delegate!(
             self,
@@ -75,9 +75,9 @@ impl backend::Text for Backend {
                 size,
                 font,
                 bounds,
+                shaping,
                 position,
                 nearest_only,
-                advanced_shape
             )
         )
     }
-- 
cgit