diff --git a/assets/fonts/Hack-Regular.ttf b/assets/fonts/Hack-Regular.ttf new file mode 100644 index 0000000..92a90cb Binary files /dev/null and b/assets/fonts/Hack-Regular.ttf differ diff --git a/assets/NotoEmoji-Regular.ttf b/assets/fonts/NotoEmoji-Regular.ttf similarity index 100% rename from assets/NotoEmoji-Regular.ttf rename to assets/fonts/NotoEmoji-Regular.ttf diff --git a/assets/Ubuntu-Light.ttf b/assets/fonts/Ubuntu-Light.ttf similarity index 100% rename from assets/Ubuntu-Light.ttf rename to assets/fonts/Ubuntu-Light.ttf diff --git a/src/egui_app.rs b/src/egui_app.rs index af9ecdb..aec0f90 100644 --- a/src/egui_app.rs +++ b/src/egui_app.rs @@ -41,20 +41,26 @@ const DEFAULT_MIN_X: f64 = -10.0; const DEFAULT_MAX_X: f64 = 10.0; const DEFAULT_INTEGRAL_NUM: usize = 100; -flate!(static FONT_FILE: [u8] from "assets/Ubuntu-Light.ttf"); // Font used when displaying text -flate!(static EMOJI_FILE: [u8] from "assets/NotoEmoji-Regular.ttf"); // Font used when displaying emojis +// Font Data +flate!(static UBUNTU_LIGHT_FILE: [u8] from "assets/fonts/Ubuntu-Light.ttf"); +flate!(static NOTOEMOJI_FILE: [u8] from "assets/fonts/NotoEmoji-Regular.ttf"); +flate!(static HACK_FILE: [u8] from "assets/fonts/Hack-Regular.ttf"); lazy_static::lazy_static! { static ref FONT_DEFINITIONS: FontDefinitions = { let mut font_data: BTreeMap = BTreeMap::new(); let mut families = BTreeMap::new(); - - font_data.insert("Ubuntu-Light".to_owned(), FontData::from_static(&FONT_FILE)); - font_data.insert("NotoEmoji-Regular".to_owned(), FontData::from_static(&EMOJI_FILE)); + + font_data.insert( + "Hack".to_owned(), + FontData::from_static(&HACK_FILE), + ); + font_data.insert("Ubuntu-Light".to_owned(), FontData::from_static(&UBUNTU_LIGHT_FILE)); + font_data.insert("NotoEmoji-Regular".to_owned(), FontData::from_static(&NOTOEMOJI_FILE)); families.insert( FontFamily::Monospace, - vec!["Ubuntu-Light".to_owned(), "NotoEmoji-Regular".to_owned()], + vec!["Hack".to_owned(), "Ubuntu-Light".to_owned(), "NotoEmoji-Regular".to_owned()], ); families.insert(