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.

Sign up for GitHub

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

Jump to bottom

Support the unpackaged format for font loading #20790

Merged
merged 1 commit into from
Feb 23, 2024
Merged

Support the unpackaged format for font loading #20790

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions src/Core/src/ImageSources/FontImageSourceService/FontImageSourceService.Windows.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@
using Microsoft.Graphics.Canvas;
using Microsoft.Graphics.Canvas.Text;
using Microsoft.Graphics.Canvas.UI.Xaml;
using Microsoft.Maui.ApplicationModel;
using Microsoft.Maui.Devices;
using Microsoft.Maui.Graphics;
using Microsoft.Maui.Storage;
using WImageSource = Microsoft.UI.Xaml.Media.ImageSource;

namespace Microsoft.Maui
Expand Down Expand Up @@ -122,6 +124,18 @@ string GetFontSource(IFontImageSource imageSource)
}
}

// unpackaged apps can't load files using packaged schemes
if (!AppInfoUtils.IsPackagedApp)
{
var fontUri = new Uri(fontSource, UriKind.RelativeOrAbsolute);

var path = fontUri.AbsolutePath.TrimStart('/');
if (FileSystemUtils.TryGetAppPackageFileUri(path, out var uri))
{
fontSource = uri + fontUri.Fragment;
}
}

return fontSource;
}
}
Expand Down
Loading