diff --git a/fonts/JetBrainsMono-VariableFont_wght.ttf b/fonts/JetBrainsMono-VariableFont_wght.ttf new file mode 100644 index 0000000000000000000000000000000000000000..1b3d7f27df2ec21ab07ddb081cd9e384c8a5ef04 Binary files /dev/null and b/fonts/JetBrainsMono-VariableFont_wght.ttf differ diff --git a/fonts/Roboto-VariableFont_wdth,wght.ttf b/fonts/Roboto-VariableFont_wdth,wght.ttf new file mode 100644 index 0000000000000000000000000000000000000000..bba55f616c811c4ee31535667dd2ed30229e5e71 Binary files /dev/null and b/fonts/Roboto-VariableFont_wdth,wght.ttf differ diff --git a/src/ui.rs b/src/ui.rs index 077abdba17c67d09579d71aa56bf547fbe52910f..a1f7030e2a67392adec41c719f71b3899227d18a 100644 --- a/src/ui.rs +++ b/src/ui.rs @@ -1,5 +1,6 @@ mod app; pub mod cache; +pub mod font; mod panes; mod persistency; mod shortcuts; diff --git a/src/ui/app.rs b/src/ui/app.rs index d9c0aca16bbfcd81149581b58a92bae21f4f6257..ad8fa9fe0387921d5596236afa2f415efecbe8e5 100644 --- a/src/ui/app.rs +++ b/src/ui/app.rs @@ -261,6 +261,9 @@ impl App { // Load the image loaders egui_extras::install_image_loaders(&ctx.egui_ctx); + // Install the fonts + super::font::add_font(&ctx.egui_ctx); + let mut layout_manager = if let Some(storage) = ctx.storage { LayoutManager::new(app_name, storage) } else { diff --git a/src/ui/font.rs b/src/ui/font.rs new file mode 100644 index 0000000000000000000000000000000000000000..fd21c80a8b7191107b592f5ff051f700c4e0a9db --- /dev/null +++ b/src/ui/font.rs @@ -0,0 +1,30 @@ +use egui::epaint::text::{FontInsert, InsertFontFamily}; + +pub const ROBOTO: &[u8] = include_bytes!(concat!( + env!("CARGO_MANIFEST_DIR"), + "/fonts/Roboto-VariableFont_wdth,wght.ttf" +)); + +pub const JETBRAINS: &[u8] = include_bytes!(concat!( + env!("CARGO_MANIFEST_DIR"), + "/fonts/JetBrainsMono-VariableFont_wght.ttf" +)); + +pub fn add_font(ctx: &egui::Context) { + ctx.add_font(FontInsert::new( + "noto_sans", + egui::FontData::from_static(ROBOTO), + vec![InsertFontFamily { + family: egui::FontFamily::Proportional, + priority: egui::epaint::text::FontPriority::Highest, + }], + )); + ctx.add_font(FontInsert::new( + "jetbrains_mono", + egui::FontData::from_static(JETBRAINS), + vec![InsertFontFamily { + family: egui::FontFamily::Monospace, + priority: egui::epaint::text::FontPriority::Highest, + }], + )); +}