Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update utilities node icon and update page layout to be left justified #3201

Merged
merged 2 commits into from
Jun 12, 2024
Merged

Update utilities node icon and update page layout to be left justified #3201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1be78f9
icon
Jun 12, 2024
14f5997
layout
Jun 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified src/Assets/Fonts/DevHome.ttf
View file
Open in desktop
Binary file not shown.
3 changes: 3 additions & 0 deletions src/Helpers/NavConfig.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ internal sealed class Tool
[JsonPropertyName("viewModelFullName")]
public string ViewModelFullName { get; set; }

[JsonPropertyName("iconFontFamily")]
public string IconFontFamily { get; set; } = "SymbolThemeFontFamily";

[JsonPropertyName("icon")]
public string Icon { get; set; }

Expand Down
3 changes: 2 additions & 1 deletion src/NavConfig.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@
"assembly": "DevHome.Utilities",
"viewFullName": "DevHome.Utilities.Views.UtilitiesMainPageView",
"viewModelFullName": "DevHome.Utilities.ViewModels.UtilitiesMainPageViewModel",
"icon": "ED35"
"iconFontFamily": "DevHomeFluentIcons",
"icon": "ECED"
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion src/Views/ShellPage.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ private void UpdateNavigationMenuItems()
helpers:NavigationHelper.NavigateTo=""{tool.ViewModelFullName}""
AutomationProperties.AutomationId=""{tool.Identity}"">
<NavigationViewItem.Icon>
<FontIcon FontFamily=""{{StaticResource SymbolThemeFontFamily}}"" Glyph=""&#x{tool.Icon};""/>
<FontIcon FontFamily=""{{StaticResource {tool.IconFontFamily}}}"" Glyph=""&#x{tool.Icon};""/>
</NavigationViewItem.Icon>
</NavigationViewItem>";
NavigationViewItem navigationViewItem = (NavigationViewItem)XamlReader.Load(navigationViewItemString);
Expand Down
3 changes: 1 addition & 2 deletions tools/Utilities/src/Views/UtilitiesMainPageView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@
MinRowSpacing="12"
MinColumnSpacing="12"
ItemsStretch="Fill"
MaximumRowsOrColumns="3"
ItemsJustification="Center" />
MaximumRowsOrColumns="3" />
</ItemsRepeater.Layout>
<ItemsRepeater.ItemTemplate>
<DataTemplate x:DataType="viewmodels:UtilityViewModel">
Expand Down
Loading