1
1
mirror of https://github.com/wez/wezterm.git synced 2024-12-18 02:42:05 +03:00

fixup build on macos

This commit is contained in:
Wez Furlong 2021-04-08 16:23:32 -07:00
parent ecc500af05
commit c4d6831cf7

View File

@ -27,7 +27,11 @@ fn descriptor_from_attr(attr: &FontAttributes) -> anyhow::Result<CTFontDescripto
.map_err(|_| anyhow::anyhow!("failed to parse family name {} as CFString", attr.family))?; .map_err(|_| anyhow::anyhow!("failed to parse family name {} as CFString", attr.family))?;
let symbolic_traits: CTFontSymbolicTraits = kCTFontMonoSpaceTrait let symbolic_traits: CTFontSymbolicTraits = kCTFontMonoSpaceTrait
| if attr.bold { kCTFontBoldTrait } else { 0 } | if attr.weight.to_opentype_weight() >= FontWeight::Bold.to_opentype_weight() {
kCTFontBoldTrait
} else {
0
}
| if attr.italic { kCTFontItalicTrait } else { 0 }; | if attr.italic { kCTFontItalicTrait } else { 0 };
let family_attr: CFString = unsafe { TCFType::wrap_under_get_rule(kCTFontFamilyNameAttribute) }; let family_attr: CFString = unsafe { TCFType::wrap_under_get_rule(kCTFontFamilyNameAttribute) };
@ -136,7 +140,8 @@ fn build_fallback_list_impl() -> anyhow::Result<Vec<FontDataHandle>> {
// a nearby approximation. // a nearby approximation.
let symbols = FontAttributes { let symbols = FontAttributes {
family: "Apple Symbols".to_string(), family: "Apple Symbols".to_string(),
bold: false, weight: FontWeight::Regular,
width: FontWidth::Normal,
italic: false, italic: false,
is_fallback: true, is_fallback: true,
is_synthetic: true, is_synthetic: true,