From 65952f4aab1743ba8d1dabbf020c80054ad80f11 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Wed, 1 Jun 2016 18:05:12 -0600
Subject: [PATCH] Font reorganization
---
src/character_map/main.rs | 2 +-
src/launcher/main.rs | 2 +-
src/terminal/console.rs | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/character_map/main.rs b/src/character_map/main.rs
index 0767933..088612e 100644
--- a/src/character_map/main.rs
+++ b/src/character_map/main.rs
@@ -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) {
diff --git a/src/launcher/main.rs b/src/launcher/main.rs
index d9c1436..715e680 100644
--- a/src/launcher/main.rs
+++ b/src/launcher/main.rs
@@ -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 {
diff --git a/src/terminal/console.rs b/src/terminal/console.rs
index b8bbaeb..c268cdd 100644
--- a/src/terminal/console.rs
+++ b/src/terminal/console.rs
@@ -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),
--
GitLab