Skip to content

Commit

Permalink
janitor: Rename some enum values
Browse files Browse the repository at this point in the history
  • Loading branch information
hunger committed Jan 29, 2022
1 parent 08df4aa commit 6ce9a60
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions sixtyfps_runtime/rendering_backends/gl/fonts.rs
Expand Up @@ -155,9 +155,9 @@ struct GlyphCoverage {
}

enum GlyphCoverageCheckResult {
CoverageIncomplete,
CoverageImproved,
CoverageComplete,
Incomplete,
Improved,
Complete,
}

pub struct FontCache {
Expand Down Expand Up @@ -353,15 +353,15 @@ impl FontCache {
// reference_text, scripts_required
//);

let fallbacks = if !matches!(coverage_result, GlyphCoverageCheckResult::CoverageComplete) {
let fallbacks = if !matches!(coverage_result, GlyphCoverageCheckResult::Complete) {
self.font_fallbacks_for_request(&request, &primary_font, reference_text)
} else {
Vec::new()
};

let fonts = core::iter::once(primary_font.femtovg_font_id)
.chain(fallbacks.iter().filter_map(|fallback_request| {
if matches!(coverage_result, GlyphCoverageCheckResult::CoverageComplete) {
if matches!(coverage_result, GlyphCoverageCheckResult::Complete) {
return None;
}

Expand All @@ -373,7 +373,7 @@ impl FontCache {
fallback_font.fontdb_face_id,
);

if matches!(coverage_result, GlyphCoverageCheckResult::CoverageImproved) {
if matches!(coverage_result, GlyphCoverageCheckResult::Improved) {
Some(fallback_font.femtovg_font_id)
} else {
None
Expand Down Expand Up @@ -582,11 +582,11 @@ impl FontCache {
if remaining_required_script_coverage < old_uncovered_scripts_count
|| remaining_required_char_coverage < old_uncovered_chars_count
{
GlyphCoverageCheckResult::CoverageImproved
GlyphCoverageCheckResult::Improved
} else if scripts_without_coverage.is_empty() && chars_without_coverage.is_empty() {
GlyphCoverageCheckResult::CoverageComplete
GlyphCoverageCheckResult::Complete
} else {
GlyphCoverageCheckResult::CoverageIncomplete
GlyphCoverageCheckResult::Incomplete
}
}
}
Expand Down

0 comments on commit 6ce9a60

Please sign in to comment.