Skip to content

Commit 0a15643

Browse files
authored
Updates all our icons to use Segoe Fluent (#12469)
* 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.
1 parent 9d7a46f commit 0a15643

File tree

11 files changed

+23
-24
lines changed

11 files changed

+23
-24
lines changed

src/cascadia/TerminalApp/CommandPalette.xaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@
145145
<!-- xE70E is ChevronUp. Rotated 90 degrees, it's _ChevronRight_ -->
146146
<FontIcon Grid.Column="2"
147147
HorizontalAlignment="Right"
148-
FontFamily="Segoe MDL2 Assets"
148+
FontFamily="{ThemeResource SymbolThemeFontFamily}"
149149
Glyph="&#xE70E;">
150150

151151
<FontIcon.RenderTransform>
@@ -199,20 +199,20 @@
199199
Orientation="Horizontal">
200200

201201
<FontIcon Margin="0,0,8,0"
202-
FontFamily="Segoe MDL2 Assets"
202+
FontFamily="{ThemeResource SymbolThemeFontFamily}"
203203
FontSize="12"
204204
Glyph="&#xEA8F;"
205205
Visibility="{x:Bind Item.(local:TabPaletteItem.TabStatus).BellIndicator, Mode=OneWay}" />
206206

207207
<FontIcon Margin="0,0,8,0"
208-
FontFamily="Segoe MDL2 Assets"
208+
FontFamily="{ThemeResource SymbolThemeFontFamily}"
209209
FontSize="12"
210210
Glyph="&#xE8A3;"
211211
Visibility="{x:Bind Item.(local:TabPaletteItem.TabStatus).IsPaneZoomed, Mode=OneWay}" />
212212

213213
<FontIcon x:Name="HeaderLockIcon"
214214
Margin="0,0,8,0"
215-
FontFamily="Segoe MDL2 Assets"
215+
FontFamily="{ThemeResource SymbolThemeFontFamily}"
216216
FontSize="12"
217217
Glyph="&#xE72E;"
218218
Visibility="{x:Bind Item.(local:TabPaletteItem.TabStatus).IsReadOnlyActive, Mode=OneWay}" />
@@ -445,7 +445,7 @@
445445
Background="Transparent"
446446
Click="_moveBackButtonClicked"
447447
ClickMode="Press">
448-
<FontIcon FontFamily="Segoe MDL2 Assets"
448+
<FontIcon FontFamily="{ThemeResource SymbolThemeFontFamily}"
449449
FontSize="12"
450450
Glyph="&#xE76b;" />
451451
</Button>

src/cascadia/TerminalApp/SettingsTab.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ namespace winrt::TerminalApp::implementation
9898

9999
if (auto tab{ weakThis.get() })
100100
{
101-
auto fontFamily = winrt::WUX::Media::FontFamily(L"Segoe MDL2 Assets");
102101
auto glyph = L"\xE713"; // This is the Setting icon (looks like a gear)
103102

104103
// The TabViewItem Icon needs MUX while the IconSourceElement in the CommandPalette needs WUX...

src/cascadia/TerminalApp/TabBase.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ namespace winrt::TerminalApp::implementation
9090
// Close
9191
Controls::MenuFlyoutItem closeTabMenuItem;
9292
Controls::FontIcon closeSymbol;
93-
closeSymbol.FontFamily(Media::FontFamily{ L"Segoe MDL2 Assets" });
93+
closeSymbol.FontFamily(Media::FontFamily{ L"Segoe Fluent Icons, Segoe MDL2 Assets" });
9494
closeSymbol.Glyph(L"\xE711");
9595

9696
closeTabMenuItem.Click([weakThis](auto&&, auto&&) {

src/cascadia/TerminalApp/TabHeaderControl.xaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,19 +48,19 @@
4848
-->
4949
<FontIcon x:Name="HeaderBellIndicator"
5050
Margin="0,0,8,0"
51-
FontFamily="Segoe MDL2 Assets"
51+
FontFamily="{ThemeResource SymbolThemeFontFamily}"
5252
FontSize="12"
5353
Glyph="&#xEA8F;"
5454
Visibility="{x:Bind TabStatus.BellIndicator, Mode=OneWay}" />
5555
<FontIcon x:Name="HeaderZoomIcon"
5656
Margin="0,0,8,0"
57-
FontFamily="Segoe MDL2 Assets"
57+
FontFamily="{ThemeResource SymbolThemeFontFamily}"
5858
FontSize="12"
5959
Glyph="&#xE8A3;"
6060
Visibility="{x:Bind TabStatus.IsPaneZoomed, Mode=OneWay}" />
6161
<FontIcon x:Name="HeaderLockIcon"
6262
Margin="0,0,8,0"
63-
FontFamily="Segoe MDL2 Assets"
63+
FontFamily="{ThemeResource SymbolThemeFontFamily}"
6464
FontSize="12"
6565
Glyph="&#xE72E;"
6666
Visibility="{x:Bind TabStatus.IsReadOnlyActive, Mode=OneWay}" />

src/cascadia/TerminalApp/TabRowControl.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<!-- EA18 is the "Shield" glyph -->
2525
<FontIcon x:Uid="ElevationShield"
2626
Margin="9,4,0,4"
27-
FontFamily="Segoe MDL2 Assets"
27+
FontFamily="{ThemeResource SymbolThemeFontFamily}"
2828
FontSize="16"
2929
Foreground="{ThemeResource SystemControlForegroundBaseMediumBrush}"
3030
Glyph="&#xEA18;"
@@ -44,7 +44,7 @@
4444
CornerRadius="{Binding Source={ThemeResource OverlayCornerRadius}, Converter={StaticResource TopCornerRadiusFilterConverter}}"
4545
DragOver="OnNewTabButtonDragOver"
4646
Drop="OnNewTabButtonDrop"
47-
FontFamily="Segoe MDL2 Assets"
47+
FontFamily="{ThemeResource SymbolThemeFontFamily}"
4848
FontSize="12"
4949
FontWeight="SemiLight"
5050
UseLayoutRounding="true">

src/cascadia/TerminalApp/TerminalPage.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -914,7 +914,7 @@ namespace winrt::TerminalApp::implementation
914914

915915
WUX::Controls::FontIcon commandPaletteIcon{};
916916
commandPaletteIcon.Glyph(L"\xE945");
917-
commandPaletteIcon.FontFamily(Media::FontFamily{ L"Segoe MDL2 Assets" });
917+
commandPaletteIcon.FontFamily(Media::FontFamily{ L"Segoe Fluent Icons, Segoe MDL2 Assets" });
918918
commandPaletteFlyout.Icon(commandPaletteIcon);
919919

920920
commandPaletteFlyout.Click({ this, &TerminalPage::_CommandPaletteButtonOnClick });

src/cascadia/TerminalApp/TerminalTab.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1178,7 +1178,7 @@ namespace winrt::TerminalApp::implementation
11781178
// "Color..."
11791179
Controls::MenuFlyoutItem chooseColorMenuItem;
11801180
Controls::FontIcon colorPickSymbol;
1181-
colorPickSymbol.FontFamily(Media::FontFamily{ L"Segoe MDL2 Assets" });
1181+
colorPickSymbol.FontFamily(Media::FontFamily{ L"Segoe Fluent Icons, Segoe MDL2 Assets" });
11821182
colorPickSymbol.Glyph(L"\xE790");
11831183

11841184
chooseColorMenuItem.Click([weakThis](auto&&, auto&&) {
@@ -1209,7 +1209,7 @@ namespace winrt::TerminalApp::implementation
12091209
{
12101210
// "Rename Tab"
12111211
Controls::FontIcon renameTabSymbol;
1212-
renameTabSymbol.FontFamily(Media::FontFamily{ L"Segoe MDL2 Assets" });
1212+
renameTabSymbol.FontFamily(Media::FontFamily{ L"Segoe Fluent Icons, Segoe MDL2 Assets" });
12131213
renameTabSymbol.Glyph(L"\xE8AC"); // Rename
12141214

12151215
renameTabMenuItem.Click([weakThis](auto&&, auto&&) {
@@ -1226,7 +1226,7 @@ namespace winrt::TerminalApp::implementation
12261226
{
12271227
// "Duplicate Tab"
12281228
Controls::FontIcon duplicateTabSymbol;
1229-
duplicateTabSymbol.FontFamily(Media::FontFamily{ L"Segoe MDL2 Assets" });
1229+
duplicateTabSymbol.FontFamily(Media::FontFamily{ L"Segoe Fluent Icons, Segoe MDL2 Assets" });
12301230
duplicateTabSymbol.Glyph(L"\xF5ED");
12311231

12321232
duplicateTabMenuItem.Click([weakThis](auto&&, auto&&) {
@@ -1243,7 +1243,7 @@ namespace winrt::TerminalApp::implementation
12431243
{
12441244
// "Split Tab"
12451245
Controls::FontIcon splitTabSymbol;
1246-
splitTabSymbol.FontFamily(Media::FontFamily{ L"Segoe MDL2 Assets" });
1246+
splitTabSymbol.FontFamily(Media::FontFamily{ L"Segoe Fluent Icons, Segoe MDL2 Assets" });
12471247
splitTabSymbol.Glyph(L"\xF246"); // ViewDashboard
12481248

12491249
splitTabMenuItem.Click([weakThis](auto&&, auto&&) {
@@ -1260,7 +1260,7 @@ namespace winrt::TerminalApp::implementation
12601260
{
12611261
// "Split Tab"
12621262
Controls::FontIcon exportTabSymbol;
1263-
exportTabSymbol.FontFamily(Media::FontFamily{ L"Segoe MDL2 Assets" });
1263+
exportTabSymbol.FontFamily(Media::FontFamily{ L"Segoe Fluent Icons, Segoe MDL2 Assets" });
12641264
exportTabSymbol.Glyph(L"\xE74E"); // Save
12651265

12661266
exportTabMenuItem.Click([weakThis](auto&&, auto&&) {

src/cascadia/TerminalControl/SearchBoxControl.xaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -255,15 +255,15 @@
255255
Click="GoBackwardClicked"
256256
IsChecked="True"
257257
Style="{StaticResource ToggleButtonStyle}">
258-
<FontIcon FontFamily="Segoe MDL2 Assets"
258+
<FontIcon FontFamily="{ThemeResource SymbolThemeFontFamily}"
259259
Glyph="&#xE74A;"
260260
Style="{ThemeResource FontIconStyle}" />
261261
</ToggleButton>
262262
<ToggleButton x:Name="GoForwardButton"
263263
x:Uid="SearchBox_SearchForwards"
264264
Click="GoForwardClicked"
265265
Style="{StaticResource ToggleButtonStyle}">
266-
<FontIcon FontFamily="Segoe MDL2 Assets"
266+
<FontIcon FontFamily="{ThemeResource SymbolThemeFontFamily}"
267267
Glyph="&#xE74B;"
268268
Style="{ThemeResource FontIconStyle}" />
269269
</ToggleButton>
@@ -278,7 +278,7 @@
278278
x:Uid="SearchBox_Close"
279279
Click="CloseClick"
280280
Style="{ThemeResource ButtonStyle}">
281-
<FontIcon FontFamily="Segoe MDL2 Assets"
281+
<FontIcon FontFamily="{ThemeResource SymbolThemeFontFamily}"
282282
FontSize="12"
283283
Glyph="&#xE711;" />
284284
</Button>

src/cascadia/TerminalSettingsEditor/Profiles_Base.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
Style="{StaticResource ExpanderSettingContainerStyle}">
109109
<StackPanel>
110110
<TextBox x:Uid="Profile_IconBox"
111-
FontFamily="Segoe UI, Segoe MDL2 Assets"
111+
FontFamily="Segoe UI, Segoe Fluent Icons, Segoe MDL2 Assets"
112112
IsSpellCheckEnabled="False"
113113
Style="{StaticResource TextBoxSettingStyle}"
114114
Text="{x:Bind Profile.Icon, Mode=TwoWay}" />

src/cascadia/TerminalSettingsEditor/SettingContainerStyle.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@
171171
Margin="0,0,-16,0"
172172
HorizontalAlignment="Right"
173173
VerticalAlignment="Center"
174-
FontFamily="Segoe UI, Segoe MDL2 Assets"
174+
FontFamily="Segoe UI, Segoe Fluent Icons, Segoe MDL2 Assets"
175175
Style="{StaticResource SettingsPageItemDescriptionStyle}"
176176
Text="{TemplateBinding CurrentValue}" />
177177
</Grid>

0 commit comments

Comments
 (0)