only keep one font; bump version

tasgon · Aug 9, 2023 · 03d599d · 03d599d
1 parent 3c0052e
commit 03d599d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 130 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bevy_iced"
-version = "0.3.1"
+version = "0.4.0"
 edition = "2021"
 description = "Iced integration for Bevy"
 authors = ["tasgon <[email protected]>"]

diff --git a/assets/fonts/Rainbow2000-License.txt b/assets/fonts/Rainbow2000-License.txt
diff --git a/assets/fonts/Rainbow2000-Regular.ttf b/assets/fonts/Rainbow2000-Regular.ttf
diff --git a/examples/fonts.rs b/examples/fonts.rs
@@ -2,13 +2,13 @@ use std::{fs, io};
 
 use bevy::prelude::*;
 use bevy_iced::iced::{
+    font,
     widget::{column, text},
     Font,
 };
 use bevy_iced::{iced, IcedContext, IcedPlugin};
 
 const ALPHAPROTA_FONT: Font = Font::with_name("Alpha Prota");
-const RAINBOW2000_FONT: Font = Font::with_name("Rainbow 2000");
 
 #[derive(Event)]
 pub enum UiMessage {}
@@ -17,13 +17,10 @@ pub fn main() -> io::Result<()> {
     App::new()
         .add_plugins(DefaultPlugins)
         .add_plugins(IcedPlugin {
-            fonts: vec![
-                fs::read("assets/fonts/AlphaProta.ttf")?.leak(),
-                fs::read("assets/fonts/Rainbow2000-Regular.ttf")?.leak(),
-            ],
+            fonts: vec![fs::read("assets/fonts/AlphaProta.ttf")?.leak()],
             settings: iced::Settings {
-                default_font: ALPHAPROTA_FONT,
                 default_text_size: 40.0,
+                default_font: ALPHAPROTA_FONT,
                 ..Default::default()
             },
         })
@@ -36,7 +33,7 @@ pub fn main() -> io::Result<()> {
 
 fn ui_system(mut ctx: IcedContext<UiMessage>) {
     ctx.display(column!(
-        text(format!("I am the default font")),
-        text(format!("I am another font")).font(RAINBOW2000_FONT)
+        text(format!("I am the default font")).font(font::Font::DEFAULT),
+        text(format!("I am another font"))
     ));
 }