disgusting duplication but works

macos-click-through
exoticus 5 years ago
parent 187ead2e1f
commit a6710a5518

@ -165,18 +165,26 @@ pub fn build_collection_by_font_name(
let mut collection = FontCollection::new(); let mut collection = FontCollection::new();
if let Some(font_name) = font_name { if let Some(font_name) = font_name {
if let Some(family) = loader.get_or_load(font_name, false) { let weight = if bold { Weight::BOLD } else { Weight::NORMAL };
let weight = if bold { Weight::BOLD } else { Weight::NORMAL }; let style = if italic { Style::Italic } else { Style::Normal };
let style = if italic { Style::Italic } else { Style::Normal }; let properties = Properties {
let properties = Properties { weight,
weight, style,
style, stretch: Stretch::NORMAL,
stretch: Stretch::NORMAL, };
};
if let Some(family) = loader.get_or_load(font_name, false) {
if let Some(font) = family.get(properties) { if let Some(font) = family.get(properties) {
collection.add_family(FontFamily::new_from_font(font.clone())); collection.add_family(FontFamily::new_from_font(font.clone()));
} }
} else {
if font_name != SYSTEM_DEFAULT_FONT {
if let Some(family) = loader.get_or_load(SYSTEM_DEFAULT_FONT, false) {
if let Some(font) = family.get(properties) {
collection.add_family(FontFamily::new_from_font(font.clone()));
}
}
}
} }
} }

Loading…
Cancel
Save