Skip to content

Commit a94989c

Browse files
zadjii-msftDHowett
authored andcommitted
Properly fall back to Segoe MDL2 for our icons on Win10 (#12438)
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: * microsoft/microsoft-ui-xaml#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) (cherry picked from commit 27a1b9d)
1 parent 4c62adf commit a94989c

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

src/cascadia/TerminalSettingsEditor/Appearances.xaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@
292292
<x:Int32>17</x:Int32>
293293
</ToggleButton.Tag>
294294
<ToggleButton.Content>
295-
<FontIcon FontFamily="Segoe Fluent Icons"
295+
<FontIcon FontFamily="{ThemeResource SymbolThemeFontFamily}"
296296
Glyph="&#xE744;"
297297
RenderTransformOrigin="0.5,0.5">
298298
<FontIcon.RenderTransform>
@@ -312,7 +312,7 @@
312312
<x:Int32>16</x:Int32>
313313
</ToggleButton.Tag>
314314
<ToggleButton.Content>
315-
<FontIcon FontFamily="Segoe Fluent Icons"
315+
<FontIcon FontFamily="{ThemeResource SymbolThemeFontFamily}"
316316
Glyph="&#xE745;"
317317
RenderTransformOrigin="0.5,0.5">
318318
<FontIcon.RenderTransform>
@@ -332,7 +332,7 @@
332332
<x:Int32>18</x:Int32>
333333
</ToggleButton.Tag>
334334
<ToggleButton.Content>
335-
<FontIcon FontFamily="Segoe Fluent Icons"
335+
<FontIcon FontFamily="{ThemeResource SymbolThemeFontFamily}"
336336
Glyph="&#xEA5F;"
337337
RenderTransformOrigin="0.5,0.5">
338338
<FontIcon.RenderTransform>
@@ -354,7 +354,7 @@
354354
<x:Int32>1</x:Int32>
355355
</ToggleButton.Tag>
356356
<ToggleButton.Content>
357-
<FontIcon FontFamily="Segoe Fluent Icons"
357+
<FontIcon FontFamily="{ThemeResource SymbolThemeFontFamily}"
358358
Glyph="&#xE746;" />
359359
</ToggleButton.Content>
360360
</ToggleButton>
@@ -369,7 +369,7 @@
369369
<x:Int32>0</x:Int32>
370370
</ToggleButton.Tag>
371371
<ToggleButton.Content>
372-
<FontIcon FontFamily="Segoe Fluent Icons"
372+
<FontIcon FontFamily="{ThemeResource SymbolThemeFontFamily}"
373373
Glyph="&#xF16E;" />
374374
</ToggleButton.Content>
375375
</ToggleButton>
@@ -384,7 +384,7 @@
384384
<x:Int32>2</x:Int32>
385385
</ToggleButton.Tag>
386386
<ToggleButton.Content>
387-
<FontIcon FontFamily="Segoe Fluent Icons"
387+
<FontIcon FontFamily="{ThemeResource SymbolThemeFontFamily}"
388388
Glyph="&#xEA61;" />
389389
</ToggleButton.Content>
390390
</ToggleButton>
@@ -401,7 +401,7 @@
401401
<x:Int32>33</x:Int32>
402402
</ToggleButton.Tag>
403403
<ToggleButton.Content>
404-
<FontIcon FontFamily="Segoe Fluent Icons"
404+
<FontIcon FontFamily="{ThemeResource SymbolThemeFontFamily}"
405405
Glyph="&#xE744;" />
406406
</ToggleButton.Content>
407407
</ToggleButton>
@@ -416,7 +416,7 @@
416416
<x:Int32>32</x:Int32>
417417
</ToggleButton.Tag>
418418
<ToggleButton.Content>
419-
<FontIcon FontFamily="Segoe Fluent Icons"
419+
<FontIcon FontFamily="{ThemeResource SymbolThemeFontFamily}"
420420
Glyph="&#xE745;" />
421421
</ToggleButton.Content>
422422
</ToggleButton>
@@ -431,7 +431,7 @@
431431
<x:Int32>34</x:Int32>
432432
</ToggleButton.Tag>
433433
<ToggleButton.Content>
434-
<FontIcon FontFamily="Segoe Fluent Icons"
434+
<FontIcon FontFamily="{ThemeResource SymbolThemeFontFamily}"
435435
Glyph="&#xEA5F;" />
436436
</ToggleButton.Content>
437437
</ToggleButton>

src/cascadia/TerminalSettingsEditor/SettingContainerStyle.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
TargetType="FontIcon">
6969
<Setter Property="Foreground" Value="{StaticResource SystemAccentColor}" />
7070
<Setter Property="FontSize" Value="11" />
71-
<Setter Property="FontFamily" Value="Segoe Fluent Icons" />
71+
<Setter Property="FontFamily" Value="{ThemeResource SymbolThemeFontFamily}" />
7272
</Style>
7373

7474
<Style x:Key="NonExpanderGrid"

0 commit comments

Comments
 (0)