Skip to content

Properly fall back to Segoe MDL2 for our icons on Win10#12438

Merged
DHowett merged 1 commit intomainfrom
dev/migrie/b/12350-reset-fonticon
Feb 8, 2022
Merged

Properly fall back to Segoe MDL2 for our icons on Win10#12438
DHowett merged 1 commit intomainfrom
dev/migrie/b/12350-reset-fonticon

Conversation

@zadjii-msft
Copy link
Member

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:

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.

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)
@ghost ghost added Area-SettingsUI Anything specific to the SUI Issue-Bug It either shouldn't be doing this or needs an investigation. Priority-3 A description (P3) Product-Terminal The new Windows Terminal. labels Feb 8, 2022
@zadjii-msft
Copy link
Member Author

Windows 11 with this PR
image

@zadjii
Copy link

zadjii commented Feb 8, 2022

windows 10:

image

@DHowett
Copy link
Member

DHowett commented Feb 8, 2022

xaml format can be a pain!

@DHowett DHowett added the Needs-Second It's a PR that needs another sign-off label Feb 8, 2022
@zadjii-msft
Copy link
Member Author

xaml format can be a pain!

pretty sure that's just the build issue that's currently impacting all PRs 😉

Copy link
Member

@miniksa miniksa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense to me.

@DHowett DHowett merged commit 27a1b9d into main Feb 8, 2022
@DHowett DHowett deleted the dev/migrie/b/12350-reset-fonticon branch February 8, 2022 23:10
DHowett pushed a commit that referenced this pull request Feb 9, 2022
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)
zadjii-msft added a commit that referenced this pull request Feb 11, 2022
* use `FontFamily="{ThemeResource SymbolThemeFontFamily}"` where possible, in XAML
* use `FontFamily{ L"Segoe Fluent Icons, Segoe MDL2 Assets" }` in codebehind

Basically just a simple string replace.

* [x] This was a bullet point in #11353
* [x] Confirmed manually on my win10 PC
* see also #12438

Screenshots below.
ghost pushed a commit that referenced this pull request Feb 11, 2022
* use `FontFamily="{ThemeResource SymbolThemeFontFamily}"` where possible, in XAML
* use `FontFamily{ L"Segoe Fluent Icons, Segoe MDL2 Assets" }` in codebehind

Basically just a simple string replace.

* [x] This was a bullet point in #11353
* [x] Confirmed manually on my win10 PC
* see also #12438

Actually, this is the last bullet in #11353, so I'm gonna say closes #11353. 

Screenshots below.
@ghost
Copy link

ghost commented Feb 11, 2022

🎉Windows Terminal Preview v1.13.10395.0 has been released which incorporates this pull request.:tada:

Handy links:

DHowett pushed a commit that referenced this pull request Feb 16, 2022
* use `FontFamily="{ThemeResource SymbolThemeFontFamily}"` where possible, in XAML
* use `FontFamily{ L"Segoe Fluent Icons, Segoe MDL2 Assets" }` in codebehind

Basically just a simple string replace.

* [x] This was a bullet point in #11353
* [x] Confirmed manually on my win10 PC
* see also #12438

Actually, this is the last bullet in #11353, so I'm gonna say closes #11353.

Screenshots below.

(cherry picked from commit 0a15643)
zadjii-msft added a commit that referenced this pull request Mar 3, 2022
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)
zadjii-msft added a commit that referenced this pull request Mar 3, 2022
* use `FontFamily="{ThemeResource SymbolThemeFontFamily}"` where possible, in XAML
* use `FontFamily{ L"Segoe Fluent Icons, Segoe MDL2 Assets" }` in codebehind

Basically just a simple string replace.

* [x] This was a bullet point in #11353
* [x] Confirmed manually on my win10 PC
* see also #12438

Actually, this is the last bullet in #11353, so I'm gonna say closes #11353. 

Screenshots below.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Area-SettingsUI Anything specific to the SUI Issue-Bug It either shouldn't be doing this or needs an investigation. Needs-Second It's a PR that needs another sign-off Priority-3 A description (P3) Product-Terminal The new Windows Terminal.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

reset to inherited value button doesn't render properly in win 10

4 participants