Skip to content
Snippets Groups Projects
Commit 65952f4a authored by Jeremy Soller's avatar Jeremy Soller
Browse files

Font reorganization

parent 73ad775b
No related branches found
No related tags found
No related merge requests found
......@@ -36,7 +36,7 @@ fn error_msg(window: &mut Window, msg: &str) {
fn main() {
let url = match env::args().nth(1) {
Some(arg) => arg,
None => "/ui/fonts/FiraSans-Regular.ttf".to_string(),
None => "/ui/fonts/Mono/Fira/Regular.ttf".to_string(),
};
match Font::from_path(&url) {
......
......@@ -139,7 +139,7 @@ fn main() {
if packages.len() > 1 {
let mut window = Window::new(-1, -1, 400, packages.len() as u32 * 32, path).unwrap();
let font = Font::from_path("/ui/fonts/UbuntuMono-Regular.ttf").unwrap();
let font = Font::find(None, None, None).unwrap();
draw_chooser(&mut window, &font, &packages, -1, -1);
'choosing: loop {
......
......@@ -73,8 +73,8 @@ impl Console {
window.sync();
Console {
window: window,
font: Font::from_path("/ui/fonts/UbuntuMono-Regular.ttf").unwrap(),
font_bold: Font::from_path("/ui/fonts/UbuntuMono-Bold.ttf").unwrap(),
font: Font::find(Some("Mono"), None, Some("Regular")).unwrap(),
font_bold: Font::find(Some("Mono"), None, Some("Bold")).unwrap(),
point_x: 0,
point_y: 0,
foreground: ansi_color(7),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment