summaryrefslogtreecommitdiff
path: root/font
diff options
context:
space:
mode:
authorLê Viết Hoàng Dũng <morepositive@outlook.com>2019-07-06 16:00:16 +0700
committerChristian Duerr <chrisduerr@users.noreply.github.com>2019-07-06 09:00:16 +0000
commite398eb84064c5eac7cb8a97c276494100a37314b (patch)
treed3bbe78fcc129e1850c3d58088bd5db343f59d17 /font
parent707f4293667d4d8564ab0afc13128463c2ee7fd5 (diff)
downloadalacritty-e398eb84064c5eac7cb8a97c276494100a37314b.tar.gz
alacritty-e398eb84064c5eac7cb8a97c276494100a37314b.zip
Use Menlo as fallback font on macOS
This commit makes alacritty use Menlo as a fallback font on macOS if the config specified font family isn't found.
Diffstat (limited to 'font')
-rw-r--r--font/src/darwin/mod.rs9
1 files changed, 5 insertions, 4 deletions
diff --git a/font/src/darwin/mod.rs b/font/src/darwin/mod.rs
index 3a481196..cccae032 100644
--- a/font/src/darwin/mod.rs
+++ b/font/src/darwin/mod.rs
@@ -314,10 +314,11 @@ pub fn descriptors_for_family(family: &str) -> Vec<Descriptor> {
let mut out = Vec::new();
trace!("Family: {}", family);
- let ct_collection = match create_for_family(family) {
- Some(c) => c,
- None => return out,
- };
+ let ct_collection = create_for_family(family).unwrap_or_else(|| {
+ // Fallback to Menlo if we can't find the config specified font family.
+ warn!("Unable to load specified font {}, falling back to Menlo", &family);
+ create_for_family("Menlo").expect("Menlo exists")
+ });
// CFArray of CTFontDescriptorRef (i think)
let descriptors = ct_collection.get_descriptors();