Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions src/UniGetUI/Controls/CustomNavViewItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ namespace UniGetUI.Controls;

internal sealed partial class CustomNavViewItem : NavigationViewItem
{
int _iconSize = 24;
int _iconSize = 20;
public IconType LocalIcon
{
set => base.Icon = new LocalIcon(value);
Expand Down Expand Up @@ -64,17 +64,17 @@ public string Text

public CustomNavViewItem()
{
Height = 54;
Height = 48;
Resources["NavigationViewItemOnLeftIconBoxHeight"] = _iconSize;
Resources["NavigationViewItemContentPresenterMargin"] = new Thickness(0);

var grid = new Grid { Height = 44 };

_progressRing = new ProgressRing
{
Width = 24,
Height = 24,
Margin = new Thickness(-42, 0, 0, 0),
Width = 20,
Height = 20,
Margin = new Thickness(-32, 0, 0, 0),
HorizontalAlignment = HorizontalAlignment.Left,
VerticalAlignment = VerticalAlignment.Center,
IsIndeterminate = true,
Expand Down
12 changes: 6 additions & 6 deletions src/UniGetUI/Pages/MainView.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@
VerticalAlignment="Stretch"
x:FieldModifier="public"
CompactModeThresholdWidth="800"
CompactPaneLength="68"
CompactPaneLength="52"
ExpandedModeThresholdWidth="1600"
IsBackButtonVisible="Collapsed"
IsPaneOpen="False"
Expand All @@ -290,7 +290,7 @@
<NavigationView.MenuItems>
<controls1:CustomNavViewItem
x:Name="DiscoverNavBtn"
FontSize="16"
FontSize="14"
FontWeight="SemiBold"
GlyphIcon="&#xF6FA;"
Tag="Discover"
Expand All @@ -299,7 +299,7 @@

<controls1:CustomNavViewItem
x:Name="UpdatesNavBtn"
FontSize="16"
FontSize="14"
FontWeight="SemiBold"
GlyphIcon="&#xE895;"
Tag="Updates"
Expand All @@ -311,15 +311,15 @@
</controls1:CustomNavViewItem>
<controls1:CustomNavViewItem
x:Name="InstalledNavBtn"
FontSize="16"
FontSize="14"
FontWeight="SemiBold"
GlyphIcon="&#xE977;"
Tag="Installed"
Text="Installed Packages"
/>
<controls1:CustomNavViewItem
x:Name="BundlesNavBtn"
FontSize="16"
FontSize="14"
FontWeight="SemiBold"
GlyphIcon="&#xF133;"
Tag="Bundles"
Expand Down Expand Up @@ -375,7 +375,7 @@
/>
</NavigationView.FooterMenuItems>
<NavigationView.PaneFooter>
<services:UserAvatar Margin="12,4,12,8" />
<services:UserAvatar Margin="6,4,6,8" />
</NavigationView.PaneFooter>

<Grid Name="ContentGrid" Grid.Row="0" Grid.Column="1" Margin="8,8,8,8" RowSpacing="0">
Expand Down
6 changes: 3 additions & 3 deletions src/UniGetUI/Services/UserAvatar.cs
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ private void SetLoading()

private PointButton GenerateLoginControl()
{
var personPicture = new PersonPicture { Width = 36, Height = 36 };
var personPicture = new PersonPicture { Width = 32, Height = 32 };

var translatedTextBlock = new TextBlock
{
Expand Down Expand Up @@ -208,8 +208,8 @@ private async Task<PointButton> GenerateLogoutControl()

var personPicture = new PersonPicture
{
Width = 36,
Height = 36,
Width = 32,
Height = 32,
ProfilePicture = new BitmapImage(new Uri(user.AvatarUrl)),
};

Expand Down
Loading