Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes font family definitions that mix embedded and system fonts #12871

Merged
merged 1 commit into from
Sep 14, 2023

Conversation

Gillibald
Copy link
Contributor

@Gillibald Gillibald commented Sep 12, 2023

What does the pull request do?

This PR introduces a way to store multiple font sources in within the FontFamilyKey object. This is needed to be able to mix embedded and system installed fonts in a fallback sequences.

What is the current behavior?

What is the updated/expected behavior with this PR?

How was the solution implemented (if it's not obvious)?

A CompositeFontFamilyKey was introduced that holds multiple keys that were created from the original FontFamily definition.

System fonts a represented by the systemfont: scheme everything else that needed a key previously is unchanged.

Checklist

Breaking changes

Obsoletions / Deprecations

Fixed issues

Fixes: #12806

@Gillibald Gillibald changed the title [WIP] Fixes font family definitions that mix embedded and system fonts Fixes font family definitions that mix embedded and system fonts Sep 13, 2023
@avaloniaui-team
Copy link
Contributor

You can test this PR using the following package version. 11.0.999-cibuild0039474-beta. (feed url: https://nuget-feed-all.avaloniaui.net/v3/index.json) [PRBUILDID]

@billhenn
Copy link
Contributor

@Gillibald - I just tested the updates and both problems in #12806 appear to be resolved with this PR. Thank you!

@Gillibald Gillibald added this pull request to the merge queue Sep 14, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Sep 14, 2023
@Gillibald Gillibald added this pull request to the merge queue Sep 14, 2023
Merged via the queue into AvaloniaUI:master with commit cb461ab Sep 14, 2023
6 checks passed
@Gillibald Gillibald deleted the fixes/embeddedFontFallbacks branch September 14, 2023 13:42
@grokys grokys added the backport-candidate-11.0.x Consider this PR for backporting to 11.0 branch label Sep 29, 2023
grokys pushed a commit that referenced this pull request Oct 2, 2023
@grokys grokys added backported-11.0.x and removed backport-candidate-11.0.x Consider this PR for backporting to 11.0 branch labels Oct 14, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Font family name parsing bugs
4 participants