From 5fd5d1cdf8e5354788dc40729c4565ef377d3bba Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Wed, 1 Mar 2023 21:34:26 +0100
Subject: Implement `Canvas` support for `iced_tiny_skia`

---
 wgpu/src/layer/text.rs | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 wgpu/src/layer/text.rs

(limited to 'wgpu/src/layer/text.rs')

diff --git a/wgpu/src/layer/text.rs b/wgpu/src/layer/text.rs
new file mode 100644
index 00000000..38d62616
--- /dev/null
+++ b/wgpu/src/layer/text.rs
@@ -0,0 +1,26 @@
+use crate::{alignment, Color, Font, Rectangle};
+
+/// A paragraph of text.
+#[derive(Debug, Clone, Copy)]
+pub struct Text<'a> {
+    /// The content of the [`Text`].
+    pub content: &'a str,
+
+    /// The layout bounds of the [`Text`].
+    pub bounds: Rectangle,
+
+    /// The color of the [`Text`], in __linear RGB_.
+    pub color: Color,
+
+    /// The size of the [`Text`].
+    pub size: f32,
+
+    /// The font of the [`Text`].
+    pub font: Font,
+
+    /// The horizontal alignment of the [`Text`].
+    pub horizontal_alignment: alignment::Horizontal,
+
+    /// The vertical alignment of the [`Text`].
+    pub vertical_alignment: alignment::Vertical,
+}
-- 
cgit 


From 3a0d34c0240f4421737a6a08761f99d6f8140d02 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Sat, 4 Mar 2023 05:37:11 +0100
Subject: Create `iced_widget` subcrate and re-organize the whole codebase

---
 wgpu/src/layer/text.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'wgpu/src/layer/text.rs')

diff --git a/wgpu/src/layer/text.rs b/wgpu/src/layer/text.rs
index 38d62616..fdbdaafb 100644
--- a/wgpu/src/layer/text.rs
+++ b/wgpu/src/layer/text.rs
@@ -1,4 +1,5 @@
-use crate::{alignment, Color, Font, Rectangle};
+use crate::core::alignment;
+use crate::core::{Color, Font, Rectangle};
 
 /// A paragraph of text.
 #[derive(Debug, Clone, Copy)]
-- 
cgit 


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/layer/text.rs | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'wgpu/src/layer/text.rs')

diff --git a/wgpu/src/layer/text.rs b/wgpu/src/layer/text.rs
index fdbdaafb..d36ff273 100644
--- a/wgpu/src/layer/text.rs
+++ b/wgpu/src/layer/text.rs
@@ -24,4 +24,14 @@ pub struct Text<'a> {
 
     /// 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,
 }
-- 
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/layer/text.rs | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'wgpu/src/layer/text.rs')

diff --git a/wgpu/src/layer/text.rs b/wgpu/src/layer/text.rs
index d36ff273..665f7188 100644
--- a/wgpu/src/layer/text.rs
+++ b/wgpu/src/layer/text.rs
@@ -1,4 +1,5 @@
 use crate::core::alignment;
+use crate::core::text;
 use crate::core::{Color, Font, Rectangle};
 
 /// A paragraph of text.
@@ -25,13 +26,6 @@ pub struct Text<'a> {
     /// 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: text::Shaping,
 }
-- 
cgit 


From 9499a8f9e6f9971dedfae563cb133232aa3cebc2 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Thu, 4 May 2023 13:00:16 +0200
Subject: Support configurable `LineHeight` in text widgets

---
 wgpu/src/layer/text.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'wgpu/src/layer/text.rs')

diff --git a/wgpu/src/layer/text.rs b/wgpu/src/layer/text.rs
index 665f7188..ba1bdca8 100644
--- a/wgpu/src/layer/text.rs
+++ b/wgpu/src/layer/text.rs
@@ -14,9 +14,12 @@ pub struct Text<'a> {
     /// The color of the [`Text`], in __linear RGB_.
     pub color: Color,
 
-    /// The size of the [`Text`].
+    /// The size of the [`Text`] in logical pixels.
     pub size: f32,
 
+    /// The line height of the [`Text`].
+    pub line_height: text::LineHeight,
+
     /// The font of the [`Text`].
     pub font: Font,
 
-- 
cgit