Store a sorted list of monospace font ids in font system
Signed-off-by: Mohammad AlSaleh <CE.Mohammad.AlSaleh@gmail.com>
This commit is contained in:
parent
3e02ae1ea6
commit
59ac0b824c
2 changed files with 31 additions and 17 deletions
|
|
@ -173,24 +173,21 @@ impl<'a> Iterator for FontFallbackIter<'a> {
|
|||
}
|
||||
// Set a monospace fallback if Monospace family is not found
|
||||
if is_mono {
|
||||
if let Some(face_info) = self.font_system.db().face(m_key.id) {
|
||||
// Don't use emoji fonts as Monospace
|
||||
if face_info.monospaced && !face_info.post_script_name.contains("Emoji") {
|
||||
let supported_cp_count_opt = self
|
||||
.font_system
|
||||
.get_font_supported_codepoints_in_word(m_key.id, self.word);
|
||||
if let Some(supported_cp_count) = supported_cp_count_opt {
|
||||
let codepoint_non_matches =
|
||||
self.word.chars().count() - supported_cp_count;
|
||||
if self.font_system.is_monospace(m_key.id) {
|
||||
let supported_cp_count_opt = self
|
||||
.font_system
|
||||
.get_font_supported_codepoints_in_word(m_key.id, self.word);
|
||||
if let Some(supported_cp_count) = supported_cp_count_opt {
|
||||
let codepoint_non_matches =
|
||||
self.word.chars().count() - supported_cp_count;
|
||||
|
||||
let fallback_info = MonospaceFallbackInfo {
|
||||
font_weight_diff: Some(m_key.font_weight_diff),
|
||||
codepoint_non_matches: Some(codepoint_non_matches),
|
||||
font_weight: m_key.font_weight,
|
||||
id: m_key.id,
|
||||
};
|
||||
assert!(self.monospace_fallbacks.insert(fallback_info));
|
||||
}
|
||||
let fallback_info = MonospaceFallbackInfo {
|
||||
font_weight_diff: Some(m_key.font_weight_diff),
|
||||
codepoint_non_matches: Some(codepoint_non_matches),
|
||||
font_weight: m_key.font_weight,
|
||||
id: m_key.id,
|
||||
};
|
||||
assert!(self.monospace_fallbacks.insert(fallback_info));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue