From 69575e1e72bc48d9ba4e914ff1279390f247adda Mon Sep 17 00:00:00 2001 From: Mike Griese Date: Tue, 8 Feb 2022 14:56:27 -0600 Subject: [PATCH] Properly fall back to Segoe MDL2 for our icons on Win10 Segoe Fluent isn't available on Windows 10, and doesn't stealthily ship with WinUI. So if we manually set the font family to `"Segoe Fluent Icons"`, then that will just display boxes in Win10. This instead uses the resource `"{ThemeResource SymbolThemeFontFamily}"` which will gracefully fall back on Win10. See: * https://github.com/microsoft/microsoft-ui-xaml/issues/3745, which inspired this solution. Guess what! The backgound image icons were also manually specifying this font, so they had to get updated too. I couldn't find any other `Segoe Fluent` references in the code. * [x] Closes #12350 * [x] Checked Windows 11 locally * [x] Checked Win10 (screenshots incoming from other machine) --- .../TerminalSettingsEditor/Appearances.xaml | 18 +++++++++--------- .../SettingContainerStyle.xaml | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/cascadia/TerminalSettingsEditor/Appearances.xaml b/src/cascadia/TerminalSettingsEditor/Appearances.xaml index 8f9d92b913b..e23ae4a2e62 100644 --- a/src/cascadia/TerminalSettingsEditor/Appearances.xaml +++ b/src/cascadia/TerminalSettingsEditor/Appearances.xaml @@ -292,7 +292,7 @@ 17 - @@ -312,7 +312,7 @@ 16 - @@ -332,7 +332,7 @@ 18 - @@ -354,7 +354,7 @@ 1 - @@ -369,7 +369,7 @@ 0 - @@ -384,7 +384,7 @@ 2 - @@ -401,7 +401,7 @@ 33 - @@ -416,7 +416,7 @@ 32 - @@ -431,7 +431,7 @@ 34 - diff --git a/src/cascadia/TerminalSettingsEditor/SettingContainerStyle.xaml b/src/cascadia/TerminalSettingsEditor/SettingContainerStyle.xaml index 90fe1628e50..28e4248be5c 100644 --- a/src/cascadia/TerminalSettingsEditor/SettingContainerStyle.xaml +++ b/src/cascadia/TerminalSettingsEditor/SettingContainerStyle.xaml @@ -68,7 +68,7 @@ TargetType="FontIcon"> - +