add ability to load system fonts via fontdb

Author: dsgallups

crates/bevy_text/src/lib.rs

@@ -75,8 +75,17 @@ pub const DEFAULT_FONT_DATA: &[u8] = include_bytes!("FiraMono-subset.ttf");
 ///
 /// When the `bevy_text` feature is enabled with the `bevy` crate, this
 /// plugin is included by default in the `DefaultPlugins`.
-#[derive(Default)]
-pub struct TextPlugin;
+pub struct TextPlugin {
+    /// If true, the [`CosmicFontSystem`] will load system fonts.
+    pub load_system_fonts: bool,
+}
+impl Default for TextPlugin {
+    fn default() -> Self {
+        Self {
+            load_system_fonts: true,
+        }
+    }
+}
 
 /// System set in [`PostUpdate`] where all 2d text update systems are executed.
 #[derive(Debug, Hash, PartialEq, Eq, Clone, SystemSet)]
@@ -92,7 +101,7 @@ impl Plugin for TextPlugin {
             .init_asset_loader::<FontLoader>()
             .init_resource::<FontAtlasSets>()
             .init_resource::<TextPipeline>()
-            .init_resource::<CosmicFontSystem>()
+            .insert_resource(CosmicFontSystem::new(self.load_system_fonts))
             .init_resource::<SwashCache>()
             .init_resource::<TextIterScratch>()
             .add_systems(

crates/bevy_text/src/pipeline.rs

@@ -30,9 +30,20 @@ pub struct CosmicFontSystem(pub cosmic_text::FontSystem);
 
 impl Default for CosmicFontSystem {
     fn default() -> Self {
+        Self::new(true)
+    }
+}
+
+impl CosmicFontSystem {
+    /// Creates a new, wrapped [`cosmic_text::FontSystem`].
+    ///
+    /// The option to load system fonts is typically provided via [`TextPlugin`](super::TextPlugin).
+    pub fn new(load_system_fonts: bool) -> Self {
         let locale = sys_locale::get_locale().unwrap_or_else(|| String::from("en-US"));
-        let db = cosmic_text::fontdb::Database::new();
-        // TODO: consider using `cosmic_text::FontSystem::new()` (load system fonts by default)
+        let mut db = cosmic_text::fontdb::Database::new();
+        if load_system_fonts {
+            db.load_system_fonts();
+        }
         Self(cosmic_text::FontSystem::new_with_locale_and_db(locale, db))
     }
 }