From b29de28d1f0f608f8029c93d154cfd1b0f8b8cbb Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Sat, 4 Feb 2023 07:33:33 +0100
Subject: Overhaul `Font` type to allow font family selection

---
 graphics/src/widget/canvas/text.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'graphics/src/widget/canvas/text.rs')

diff --git a/graphics/src/widget/canvas/text.rs b/graphics/src/widget/canvas/text.rs
index 056f8204..8c0b2dfb 100644
--- a/graphics/src/widget/canvas/text.rs
+++ b/graphics/src/widget/canvas/text.rs
@@ -34,7 +34,7 @@ impl Default for Text {
             position: Point::ORIGIN,
             color: Color::BLACK,
             size: 16.0,
-            font: Font::Default,
+            font: Font::SansSerif,
             horizontal_alignment: alignment::Horizontal::Left,
             vertical_alignment: alignment::Vertical::Top,
         }
-- 
cgit 


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`

---
 graphics/src/widget/canvas/text.rs | 57 --------------------------------------
 1 file changed, 57 deletions(-)
 delete mode 100644 graphics/src/widget/canvas/text.rs

(limited to 'graphics/src/widget/canvas/text.rs')

diff --git a/graphics/src/widget/canvas/text.rs b/graphics/src/widget/canvas/text.rs
deleted file mode 100644
index 8c0b2dfb..00000000
--- a/graphics/src/widget/canvas/text.rs
+++ /dev/null
@@ -1,57 +0,0 @@
-use crate::alignment;
-use crate::{Color, Font, Point};
-
-/// A bunch of text that can be drawn to a canvas
-#[derive(Debug, Clone)]
-pub struct Text {
-    /// The contents of the text
-    pub content: String,
-    /// The position of the text relative to the alignment properties.
-    /// By default, this position will be relative to the top-left corner coordinate meaning that
-    /// if the horizontal and vertical alignments are unchanged, this property will tell where the
-    /// top-left corner of the text should be placed.
-    /// By changing the horizontal_alignment and vertical_alignment properties, you are are able to
-    /// change what part of text is placed at this positions.
-    /// For example, when the horizontal_alignment and vertical_alignment are set to Center, the
-    /// center of the text will be placed at the given position NOT the top-left coordinate.
-    pub position: Point,
-    /// The color of the text
-    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,
-}
-
-impl Default for Text {
-    fn default() -> Text {
-        Text {
-            content: String::new(),
-            position: Point::ORIGIN,
-            color: Color::BLACK,
-            size: 16.0,
-            font: Font::SansSerif,
-            horizontal_alignment: alignment::Horizontal::Left,
-            vertical_alignment: alignment::Vertical::Top,
-        }
-    }
-}
-
-impl From<String> for Text {
-    fn from(content: String) -> Text {
-        Text {
-            content,
-            ..Default::default()
-        }
-    }
-}
-
-impl From<&str> for Text {
-    fn from(content: &str) -> Text {
-        String::from(content).into()
-    }
-}
-- 
cgit