Introduce `text::Shaping` enum and replace magic boolean

4 files changed, 20 insertions, 33 deletions

diff --git a/graphics/src/backend.rs b/graphics/src/backend.rs
index 0e107dd5..0c2a6d30 100644
--- a/graphics/src/backend.rs
+++ b/graphics/src/backend.rs
@@ -48,7 +48,7 @@ pub trait Text {
         size: f32,
         font: Font,
         bounds: Size,
-        advanced_shape: bool,
+        shaping: text::Shaping,
     ) -> (f32, f32);
 
     /// Tests whether the provided point is within the boundaries of [`Text`]
@@ -64,9 +64,9 @@ pub trait Text {
         size: f32,
         font: Font,
         bounds: Size,
+        shaping: text::Shaping,
         point: Point,
         nearest_only: bool,
-        advanced_shape: bool,
     ) -> Option<text::Hit>;
 
     /// Loads a [`Font`] from its bytes.
diff --git a/graphics/src/geometry/text.rs b/graphics/src/geometry/text.rs
index f4af9ee4..0f731e74 100644
--- a/graphics/src/geometry/text.rs
+++ b/graphics/src/geometry/text.rs
@@ -1,5 +1,6 @@
-use iced_core::alignment;
-use iced_core::{Color, Font, Point};
+use crate::core::alignment;
+use crate::core::text::Shaping;
+use crate::core::{Color, Font, Point};
 
 /// A bunch of text that can be drawn to a canvas
 #[derive(Debug, Clone)]
@@ -25,15 +26,8 @@ pub struct Text {
     pub horizontal_alignment: alignment::Horizontal,
     /// The vertical alignment of the text
     pub vertical_alignment: alignment::Vertical,
-    /// Whether the text needs advanced shaping and font fallback.
-    ///
-    /// You will need to enable this flag if the text contains a complex
-    /// script, the font used needs it, and/or multiple fonts in your system
-    /// may be needed to display all of the glyphs.
-    ///
-    /// Advanced shaping is expensive! You should only enable it when
-    /// necessary.
-    pub advanced_shape: bool,
+    /// The shaping strategy of the text.
+    pub shaping: Shaping,
 }
 
 impl Default for Text {
@@ -46,7 +40,7 @@ impl Default for Text {
             font: Font::default(),
             horizontal_alignment: alignment::Horizontal::Left,
             vertical_alignment: alignment::Vertical::Top,
-            advanced_shape: false,
+            shaping: Shaping::Basic,
         }
     }
 }
diff --git a/graphics/src/primitive.rs b/graphics/src/primitive.rs
index 2d9c221b..db237035 100644
--- a/graphics/src/primitive.rs
+++ b/graphics/src/primitive.rs
@@ -1,7 +1,8 @@
-use iced_core::alignment;
-use iced_core::image;
-use iced_core::svg;
-use iced_core::{Background, Color, Font, Gradient, Rectangle, Size, Vector};
+use crate::core::alignment;
+use crate::core::image;
+use crate::core::svg;
+use crate::core::text;
+use crate::core::{Background, Color, Font, Gradient, Rectangle, Size, Vector};
 
 use bytemuck::{Pod, Zeroable};
 use std::sync::Arc;
@@ -26,15 +27,8 @@ pub enum Primitive {
         horizontal_alignment: alignment::Horizontal,
         /// The vertical alignment of the text
         vertical_alignment: alignment::Vertical,
-        /// Whether the text needs advanced shaping and font fallback.
-        ///
-        /// You will need to enable this flag if the text contains a complex
-        /// script, the font used needs it, and/or multiple fonts in your system
-        /// may be needed to display all of the glyphs.
-        ///
-        /// Advanced shaping is expensive! You should only enable it when
-        /// necessary.
-        advanced_shape: bool,
+        /// The shaping strategy of the text.
+        shaping: text::Shaping,
     },
     /// A quad primitive
     Quad {
diff --git a/graphics/src/renderer.rs b/graphics/src/renderer.rs
index 558e21dd..605286d6 100644
--- a/graphics/src/renderer.rs
+++ b/graphics/src/renderer.rs
@@ -138,10 +138,9 @@ where
         size: f32,
         font: Font,
         bounds: Size,
-        needs_shaping: bool,
+        shaping: text::Shaping,
     ) -> (f32, f32) {
-        self.backend()
-            .measure(content, size, font, bounds, needs_shaping)
+        self.backend().measure(content, size, font, bounds, shaping)
     }
 
     fn hit_test(
@@ -150,18 +149,18 @@ where
         size: f32,
         font: Font,
         bounds: Size,
+        shaping: text::Shaping,
         point: Point,
         nearest_only: bool,
-        advanced_shape: bool,
     ) -> Option<text::Hit> {
         self.backend().hit_test(
             content,
             size,
             font,
             bounds,
+            shaping,
             point,
             nearest_only,
-            advanced_shape,
         )
     }
 
@@ -178,7 +177,7 @@ where
             font: text.font,
             horizontal_alignment: text.horizontal_alignment,
             vertical_alignment: text.vertical_alignment,
-            advanced_shape: text.advanced_shape,
+            shaping: text.shaping,
         });
     }
 }