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

---
 tiny_skia/src/backend.rs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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

diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
index 9c69e1d2..0a06f8c9 100644
--- a/tiny_skia/src/backend.rs
+++ b/tiny_skia/src/backend.rs
@@ -219,6 +219,7 @@ impl Backend {
                 font,
                 horizontal_alignment,
                 vertical_alignment,
+                advanced_shape,
             } => {
                 let physical_bounds =
                     (primitive.bounds() + translation) * scale_factor;
@@ -238,6 +239,7 @@ impl Backend {
                     *font,
                     *horizontal_alignment,
                     *vertical_alignment,
+                    *advanced_shape,
                     pixels,
                     clip_mask,
                 );
@@ -626,8 +628,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(
@@ -638,6 +642,7 @@ impl backend::Text for Backend {
         bounds: Size,
         point: Point,
         nearest_only: bool,
+        advanced_shape: bool,
     ) -> Option<text::Hit> {
         self.text_pipeline.hit_test(
             contents,
@@ -646,6 +651,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

---
 tiny_skia/src/backend.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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

diff --git a/tiny_skia/src/backend.rs b/tiny_skia/src/backend.rs
index 0a06f8c9..3ef7e717 100644
--- a/tiny_skia/src/backend.rs
+++ b/tiny_skia/src/backend.rs
@@ -219,7 +219,7 @@ impl Backend {
                 font,
                 horizontal_alignment,
                 vertical_alignment,
-                advanced_shape,
+                shaping,
             } => {
                 let physical_bounds =
                     (primitive.bounds() + translation) * scale_factor;
@@ -239,7 +239,7 @@ impl Backend {
                     *font,
                     *horizontal_alignment,
                     *vertical_alignment,
-                    *advanced_shape,
+                    *shaping,
                     pixels,
                     clip_mask,
                 );
@@ -628,10 +628,10 @@ impl backend::Text for Backend {
         size: f32,
         font: Font,
         bounds: Size,
-        advanced_shape: bool,
+        shaping: text::Shaping,
     ) -> (f32, f32) {
         self.text_pipeline
-            .measure(contents, size, font, bounds, advanced_shape)
+            .measure(contents, size, font, bounds, shaping)
     }
 
     fn hit_test(
@@ -640,18 +640,18 @@ impl backend::Text for Backend {
         size: f32,
         font: Font,
         bounds: Size,
+        shaping: text::Shaping,
         point: Point,
         nearest_only: bool,
-        advanced_shape: bool,
     ) -> Option<text::Hit> {
         self.text_pipeline.hit_test(
             contents,
             size,
             font,
             bounds,
+            shaping,
             point,
             nearest_only,
-            advanced_shape,
         )
     }
 
-- 
cgit