diff --git a/build/nuget/Uno.WinUI.nuspec b/build/nuget/Uno.WinUI.nuspec index 70d492fd08b7..ca2ae3426042 100644 --- a/build/nuget/Uno.WinUI.nuspec +++ b/build/nuget/Uno.WinUI.nuspec @@ -34,6 +34,7 @@ + @@ -41,6 +42,7 @@ + @@ -48,6 +50,7 @@ + @@ -55,6 +58,7 @@ + @@ -67,6 +71,7 @@ + @@ -74,6 +79,7 @@ + @@ -81,6 +87,7 @@ + @@ -88,6 +95,7 @@ + @@ -95,6 +103,7 @@ + @@ -106,6 +115,7 @@ + diff --git a/src/Uno.UI/Directory.Build.targets b/src/Uno.UI/Directory.Build.targets index 2b7440659629..1ee0ef6bf5ff 100644 --- a/src/Uno.UI/Directory.Build.targets +++ b/src/Uno.UI/Directory.Build.targets @@ -3,6 +3,7 @@ + diff --git a/src/Uno.UI/FeatureConfiguration.cs b/src/Uno.UI/FeatureConfiguration.cs index 12dbb71e10f1..48005f222c0c 100644 --- a/src/Uno.UI/FeatureConfiguration.cs +++ b/src/Uno.UI/FeatureConfiguration.cs @@ -199,7 +199,7 @@ public static string SymbolsFont /// The default font family for text when a font isn't explicitly specified (e.g. for a TextBlock) /// This is often needs to be set by users on Linux, where Microsoft's Segoe UI isn't present /// - public static string DefaultTextFontFamily { get; set; } = "Segoe UI"; + public static string DefaultTextFontFamily { get; set; } = "ms-appx:///Uno.Fonts.OpenSans/Fonts/OpenSans-Regular-VariableFont_wdth,wght.ttf"; /// /// Ignores text scale factor, resulting in a font size as dictated by the control. diff --git a/src/Uno.UI/UI/Xaml/Documents/TextFormatting/FontDetailsCache.skia.cs b/src/Uno.UI/UI/Xaml/Documents/TextFormatting/FontDetailsCache.skia.cs index 14932665cf3a..eb8ae29a6f75 100644 --- a/src/Uno.UI/UI/Xaml/Documents/TextFormatting/FontDetailsCache.skia.cs +++ b/src/Uno.UI/UI/Xaml/Documents/TextFormatting/FontDetailsCache.skia.cs @@ -38,7 +38,7 @@ private static FontDetails GetFontInternal( SKTypeface GetDefaultTypeFace() { - // if Segoe UI is not found, it will automatically return a system default + // if the specified default font is not found, it will automatically return a system default return SKTypeface.FromFamilyName(FeatureConfiguration.Font.DefaultTextFontFamily, skWeight, skWidth, skSlant); } diff --git a/src/Uno.UI/UI/Xaml/FontFamily.cs b/src/Uno.UI/UI/Xaml/FontFamily.cs index b7c2272f27db..6e38ec2e1db2 100644 --- a/src/Uno.UI/UI/Xaml/FontFamily.cs +++ b/src/Uno.UI/UI/Xaml/FontFamily.cs @@ -22,7 +22,7 @@ public FontFamily(string familyName) // Makes introduction of FontFamily a non-breaking change (for now) public static implicit operator FontFamily(string familyName) => new FontFamily(familyName); - public static FontFamily Default { get; } = new FontFamily("Segoe UI"); + public static FontFamily Default { get; } = new FontFamily("ms-appx:///Uno.Fonts.OpenSans/Fonts/OpenSans-Regular-VariableFont_wdth,wght.ttf"); public static FontFamily XamlAutoFontFamily => Default;