Skip to content

Commit e04bee2

Browse files
committed
Update & revert
1 parent 13e1f84 commit e04bee2

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

src/Files.App.Storage/Storables/WindowsStorage/WindowsStorableHelpers.Icon.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Copyright (c) Files Community
22
// Licensed under the MIT License.
33

4-
using System.Drawing;
54
using System.Collections.Concurrent;
65
using System.Runtime.InteropServices;
76
using Windows.Win32;

src/Files.App/UserControls/NavigationToolbar.xaml.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,13 +273,18 @@ private async void Omnibar_TextChanged(Omnibar sender, OmnibarTextChangedEventAr
273273

274274
private async void BreadcrumbBar_ItemClicked(Controls.BreadcrumbBar sender, Controls.BreadcrumbBarItemClickedEventArgs args)
275275
{
276+
// Navigation to the current folder should not happen
277+
if (args.Index == ViewModel.PathComponents.Count - 1 ||
278+
ViewModel.PathComponents[args.Index].Path is not { } path)
279+
return;
280+
276281
if (args.IsRootItem)
277282
{
278283
await ViewModel.HandleItemNavigationAsync("Home");
279284
return;
280285
}
281286

282-
await ViewModel.HandleFolderNavigationAsync(ViewModel.PathComponents[args.Index].Path);
287+
await ViewModel.HandleFolderNavigationAsync(path);
283288
}
284289

285290
private async void BreadcrumbBar_ItemDropDownFlyoutOpening(object sender, BreadcrumbBarItemDropDownFlyoutEventArgs e)

src/Files.App/ViewModels/UserControls/NavigationToolbarViewModel.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -839,6 +839,7 @@ public async Task SetPathBoxDropDownFlyoutAsync(MenuFlyout flyout, PathBoxItem p
839839
Icon = new FontIcon { Glyph = "\uE7BA" },
840840
Text = Strings.SubDirectoryAccessDenied.GetLocalizedResource(),
841841
//Foreground = (SolidColorBrush)Application.Current.Resources["SystemControlErrorTextForegroundBrush"],
842+
FontSize = 12
842843
};
843844

844845
flyout.Items?.Add(flyoutItem);
@@ -858,6 +859,7 @@ public async Task SetPathBoxDropDownFlyoutAsync(MenuFlyout flyout, PathBoxItem p
858859
{
859860
Icon = new FontIcon { Glyph = "\uE8B7" }, // Use font icon as placeholder
860861
Text = childFolder.Item.Name,
862+
FontSize = 12
861863
};
862864

863865
if (workingPath != childFolder.Path)

0 commit comments

Comments
 (0)