From b3c192a2e478e9f2a101aecb417e316ed6900a80 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Fri, 19 Jun 2020 00:08:28 +0200
Subject: Make default text size configurable in `Settings`

---
 wgpu/src/backend.rs  | 8 ++++++++
 wgpu/src/settings.rs | 6 ++++++
 2 files changed, 14 insertions(+)

(limited to 'wgpu/src')

diff --git a/wgpu/src/backend.rs b/wgpu/src/backend.rs
index 9ed4438b..a25f42f7 100644
--- a/wgpu/src/backend.rs
+++ b/wgpu/src/backend.rs
@@ -24,6 +24,8 @@ pub struct Backend {
 
     #[cfg(any(feature = "image", feature = "svg"))]
     image_pipeline: image::Pipeline,
+
+    default_text_size: u16,
 }
 
 impl Backend {
@@ -50,6 +52,8 @@ impl Backend {
 
             #[cfg(any(feature = "image", feature = "svg"))]
             image_pipeline,
+
+            default_text_size: settings.default_text_size,
         }
     }
 
@@ -245,6 +249,10 @@ impl backend::Text for Backend {
     const ICON_FONT: Font = font::ICONS;
     const CHECKMARK_ICON: char = font::CHECKMARK_ICON;
 
+    fn default_size(&self) -> u16 {
+        self.default_text_size
+    }
+
     fn measure(
         &self,
         contents: &str,
diff --git a/wgpu/src/settings.rs b/wgpu/src/settings.rs
index 4655e64f..bc146c4c 100644
--- a/wgpu/src/settings.rs
+++ b/wgpu/src/settings.rs
@@ -16,6 +16,11 @@ pub struct Settings {
     /// If `None` is provided, a default system font will be chosen.
     pub default_font: Option<&'static [u8]>,
 
+    /// The default size of text.
+    ///
+    /// By default, it will be set to 20.
+    pub default_text_size: u16,
+
     /// The antialiasing strategy that will be used for triangle primitives.
     pub antialiasing: Option<Antialiasing>,
 }
@@ -25,6 +30,7 @@ impl Default for Settings {
         Settings {
             format: wgpu::TextureFormat::Bgra8UnormSrgb,
             default_font: None,
+            default_text_size: 20,
             antialiasing: None,
         }
     }
-- 
cgit