titaniumtown/YTBN-Graphing-Software
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

font stuff

Browse Source
This commit is contained in:
Simon Gardling 2022-03-08 13:23:59 -05:00
parent ec8593b22a
commit df9d366bd3
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/fonts/Hack-Regular.ttf Normal file
View File

Binary file not shown.

0
assets/NotoEmoji-Regular.ttf → assets/fonts/NotoEmoji-Regular.ttf
View File

0
assets/Ubuntu-Light.ttf → assets/fonts/Ubuntu-Light.ttf
View File

16
src/egui_app.rs
View File

@ -41,20 +41,26 @@ const DEFAULT_MIN_X: f64 = -10.0;
const DEFAULT_MAX_X: f64 = 10.0; const DEFAULT_MAX_X: f64 = 10.0;
const DEFAULT_INTEGRAL_NUM: usize = 100; const DEFAULT_INTEGRAL_NUM: usize = 100;
flate!(static FONT_FILE: [u8] from "assets/Ubuntu-Light.ttf"); // Font used when displaying text // Font Data
flate!(static EMOJI_FILE: [u8] from "assets/NotoEmoji-Regular.ttf"); // Font used when displaying emojis 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! { lazy_static::lazy_static! {
static ref FONT_DEFINITIONS: FontDefinitions = { static ref FONT_DEFINITIONS: FontDefinitions = {
let mut font_data: BTreeMap<String, FontData> = BTreeMap::new(); let mut font_data: BTreeMap<String, FontData> = BTreeMap::new();
let mut families = BTreeMap::new(); let mut families = BTreeMap::new();
font_data.insert("Ubuntu-Light".to_owned(), FontData::from_static(&FONT_FILE)); font_data.insert(
font_data.insert("NotoEmoji-Regular".to_owned(), FontData::from_static(&EMOJI_FILE)); "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( families.insert(
FontFamily::Monospace, 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( families.insert(