aljaz/notedeck
1
0
Fork 0
mirror of https://github.com/aljazceru/notedeck.git synced 2025-12-29 22:14:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

fonts: remove old font loading code

Browse Source 
Signed-off-by: William Casarin <jb55@jb55.com>
This commit is contained in:
William Casarin
2024-02-16 11:36:56 -08:00
parent 97aaa651d8
commit 300dfc8a4e
2 changed files with 3 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app.rs
View File

@@ -1,6 +1,6 @@
use crate::abbrev;
use crate::error::Error;
use crate::fonts::{setup_gossip_fonts, NamedFontFamily};
use crate::fonts::{setup_fonts, NamedFontFamily};
use crate::frame_history::FrameHistory;
use crate::images::fetch_img;
use crate::notecache::NoteCache;
@@ -439,7 +439,7 @@ impl Damus {
//}
//
setup_gossip_fonts(&cc.egui_ctx);
setup_fonts(&cc.egui_ctx);
cc.egui_ctx
.set_pixels_per_point(cc.egui_ctx.pixels_per_point() + 0.2);

30
src/fonts.rs
View File

@@ -19,37 +19,9 @@ impl NamedFontFamily {
}
}
pub fn setup_fonts(ctx: &egui::Context) {
let mut fonts = FontDefinitions::default();
let _families = BTreeMap::<String, FontData>::new();
let our_font: String = "onest".to_owned();
// Install my own font (maybe supporting non-latin characters):
fonts.font_data.insert(
our_font.clone(),
FontData::from_static(include_bytes!(
"../assets/fonts/onest/OnestRegular1602-hint.ttf"
)),
); // .ttf and .otf supported
// Put my font first (highest priority):
fonts
.families
.get_mut(&egui::FontFamily::Proportional)
.unwrap()
.insert(0, our_font);
// Put my font as last fallback for monospace:
//fonts.families.get_mut(&FontFamily::Monospace).unwrap()
//.push("onest".to_owned());
ctx.set_fonts(fonts);
}
// Use gossip's approach to font loading. This includes japanese fonts
// for rending stuff from japanese users.
pub fn setup_gossip_fonts(ctx: &egui::Context) {
pub fn setup_fonts(ctx: &egui::Context) {
let mut font_data: BTreeMap<String, FontData> = BTreeMap::new();
let mut families = BTreeMap::new();