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
910 changes: 454 additions & 456 deletions src/Files.App/Views/LayoutModes/ColumnViewBase.xaml

Large diffs are not rendered by default.

5 changes: 0 additions & 5 deletions src/Files.App/Views/LayoutModes/ColumnViewBase.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -577,10 +577,5 @@ protected override void BaseFolderSettings_LayoutModeChangeRequested(object send
}
}
}

private void RefreshContainer_RefreshRequested(RefreshContainer sender, RefreshRequestedEventArgs args)
{
ParentShellPageInstance.FilesystemViewModel.RefreshItems(ParentShellPageInstance.FilesystemViewModel.WorkingDirectory, SetSelectedItemsOnNavigation);
}
}
}
2,000 changes: 999 additions & 1,001 deletions src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml

Large diffs are not rendered by default.

5 changes: 0 additions & 5 deletions src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -798,11 +798,6 @@ private void FileList_Loaded(object sender, RoutedEventArgs e)
ContentScroller = FileList.FindDescendant<ScrollViewer>(x => x.Name == "ScrollViewer");
}

private void RefreshContainer_RefreshRequested(RefreshContainer sender, RefreshRequestedEventArgs args)
{
ParentShellPageInstance.FilesystemViewModel.RefreshItems(ParentShellPageInstance.FilesystemViewModel.WorkingDirectory, SetSelectedItemsOnNavigation);
}

private void SetDetailsColumnsAsDefault_Click(object sender, RoutedEventArgs e)
{
FolderSettings.SetDefaultLayoutPreferences(ColumnsViewModel);
Expand Down
2 changes: 0 additions & 2 deletions src/Files.App/Views/LayoutModes/GridViewBrowser.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,6 @@
</Style>
</local:BaseLayout.Resources>

<RefreshContainer RefreshRequested="RefreshContainer_RefreshRequested">
<Grid
x:Name="RootGrid"
Padding="0,0,0,0"
Expand Down Expand Up @@ -719,5 +718,4 @@
StrokeThickness="1" />
</Canvas>
</Grid>
</RefreshContainer>
</local:BaseLayout>
21 changes: 8 additions & 13 deletions src/Files.App/Views/LayoutModes/GridViewBrowser.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
using Files.Shared.Enums;
using CommunityToolkit.WinUI.UI;
using Files.App.EventArguments;
using Files.App.Filesystem;
using Files.App.Helpers;
using Files.App.Helpers.XamlHelpers;
using Files.App.Interacts;
using Files.App.UserControls.Selection;
using CommunityToolkit.WinUI.UI;
using System;
using System.Collections.Generic;
using System.Linq;
using Windows.Storage;
using Windows.System;
using Windows.UI.Core;
using Files.Shared.Enums;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Controls.Primitives;
using Microsoft.UI.Xaml.Input;
using Microsoft.UI.Xaml.Media;
using Microsoft.UI.Xaml.Navigation;
using System;
using System.Collections.Generic;
using System.Linq;
using Windows.Storage;
using Windows.System;
using Windows.UI.Core;

namespace Files.App.Views.LayoutModes
{
Expand Down Expand Up @@ -583,10 +583,5 @@ private void Grid_Loaded(object sender, RoutedEventArgs e)
var itemContainer = item as GridViewItem;
itemContainer.ContextFlyout = ItemContextMenuFlyout;
}

private void RefreshContainer_RefreshRequested(RefreshContainer sender, RefreshRequestedEventArgs args)
{
ParentShellPageInstance.FilesystemViewModel.RefreshItems(ParentShellPageInstance.FilesystemViewModel.WorkingDirectory, SetSelectedItemsOnNavigation);
}
}
}