From ed3454301e663a7cb7d73cd56b57b188f4d14a2f Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Wed, 30 Aug 2023 04:31:21 +0200
Subject: Implement explicit text caching in the widget state tree

---
 src/settings.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/settings.rs')

diff --git a/src/settings.rs b/src/settings.rs
index 0dd46584..794f89fd 100644
--- a/src/settings.rs
+++ b/src/settings.rs
@@ -1,6 +1,6 @@
 //! Configure your application.
 use crate::window;
-use crate::Font;
+use crate::{Font, Pixels};
 
 /// The settings of an application.
 #[derive(Debug, Clone)]
@@ -29,7 +29,7 @@ pub struct Settings<Flags> {
     /// The text size that will be used by default.
     ///
     /// The default value is `16.0`.
-    pub default_text_size: f32,
+    pub default_text_size: Pixels,
 
     /// If set to true, the renderer will try to perform antialiasing for some
     /// primitives.
@@ -80,7 +80,7 @@ where
             window: Default::default(),
             flags: Default::default(),
             default_font: Default::default(),
-            default_text_size: 16.0,
+            default_text_size: Pixels(16.0),
             antialiasing: false,
             exit_on_close_request: true,
         }
-- 
cgit 


From 89d9f1d7d2202029028a487df1dd11b0665a7517 Mon Sep 17 00:00:00 2001
From: Matthias Vogelgesang <matthias.vogelgesang@gmail.com>
Date: Sat, 9 Sep 2023 12:24:47 +0200
Subject: Fix majority of unresolved documentation links

---
 src/settings.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/settings.rs')

diff --git a/src/settings.rs b/src/settings.rs
index 0dd46584..8659603c 100644
--- a/src/settings.rs
+++ b/src/settings.rs
@@ -23,7 +23,7 @@ pub struct Settings<Flags> {
 
     /// The default [`Font`] to be used.
     ///
-    /// By default, it uses [`Font::SansSerif`].
+    /// By default, it uses [`Family::SansSerif`](crate::font::Family::SansSerif).
     pub default_font: Font,
 
     /// The text size that will be used by default.
-- 
cgit 


From e7326f0af6f16cf2ff04fbac93bf296a044923f4 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Mon, 18 Sep 2023 19:07:41 +0200
Subject: Flesh out the `editor` example a bit more

---
 src/settings.rs | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src/settings.rs')

diff --git a/src/settings.rs b/src/settings.rs
index d9778d7e..6b9ce095 100644
--- a/src/settings.rs
+++ b/src/settings.rs
@@ -2,6 +2,8 @@
 use crate::window;
 use crate::{Font, Pixels};
 
+use std::borrow::Cow;
+
 /// The settings of an application.
 #[derive(Debug, Clone)]
 pub struct Settings<Flags> {
@@ -21,6 +23,9 @@ pub struct Settings<Flags> {
     /// [`Application`]: crate::Application
     pub flags: Flags,
 
+    /// The fonts to load on boot.
+    pub fonts: Vec<Cow<'static, [u8]>>,
+
     /// The default [`Font`] to be used.
     ///
     /// By default, it uses [`Family::SansSerif`](crate::font::Family::SansSerif).
@@ -62,6 +67,7 @@ impl<Flags> Settings<Flags> {
             flags,
             id: default_settings.id,
             window: default_settings.window,
+            fonts: default_settings.fonts,
             default_font: default_settings.default_font,
             default_text_size: default_settings.default_text_size,
             antialiasing: default_settings.antialiasing,
@@ -79,6 +85,7 @@ where
             id: None,
             window: Default::default(),
             flags: Default::default(),
+            fonts: Default::default(),
             default_font: Default::default(),
             default_text_size: Pixels(16.0),
             antialiasing: false,
@@ -93,6 +100,7 @@ impl<Flags> From<Settings<Flags>> for iced_winit::Settings<Flags> {
             id: settings.id,
             window: settings.window.into(),
             flags: settings.flags,
+            fonts: settings.fonts,
             exit_on_close_request: settings.exit_on_close_request,
         }
     }
-- 
cgit 


From 42ed90bc6f92b2085d193e7f143430b8d3847c21 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Wed, 20 Sep 2023 04:51:08 +0200
Subject: Fix `clippy::default_trait_access`

---
 src/settings.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/settings.rs')

diff --git a/src/settings.rs b/src/settings.rs
index d9778d7e..c5e28e86 100644
--- a/src/settings.rs
+++ b/src/settings.rs
@@ -77,9 +77,9 @@ where
     fn default() -> Self {
         Self {
             id: None,
-            window: Default::default(),
+            window: window::Settings::default(),
             flags: Default::default(),
-            default_font: Default::default(),
+            default_font: Font::default(),
             default_text_size: Pixels(16.0),
             antialiasing: false,
             exit_on_close_request: true,
-- 
cgit