Merge branch 'main' of https://github.com/files-community/Files into terminal

gave92 · gave92 · commit 9ac9c59125c5 · 2024-05-01T14:17:49.000+02:00
diff --git a/src/Files.App/Data/Models/ItemManipulationModel.cs b/src/Files.App/Data/Models/ItemManipulationModel.cs
@@ -23,6 +23,8 @@ public sealed class ItemManipulationModel
 
 		public event EventHandler<ListedItem> ScrollIntoViewInvoked;
 
+		public event EventHandler ScrollToTopInvoked;
+
 		public event EventHandler SetDragModeForItemsInvoked;
 
 		public event EventHandler RefreshItemsOpacityInvoked;
@@ -104,6 +106,11 @@ public void ScrollIntoView(ListedItem item)
 			ScrollIntoViewInvoked?.Invoke(this, item);
 		}
 
+		public void ScrollToTop()
+		{
+			ScrollToTopInvoked?.Invoke(this, EventArgs.Empty);
+		}
+
 		public void SetDragModeForItems()
 		{
 			SetDragModeForItemsInvoked?.Invoke(this, EventArgs.Empty);
diff --git a/src/Files.App/MainWindow.xaml.cs b/src/Files.App/MainWindow.xaml.cs
@@ -1,15 +1,11 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.App.UserControls.TabBar;
 using Microsoft.UI;
 using Microsoft.UI.Windowing;
-using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media.Animation;
 using Microsoft.UI.Xaml.Navigation;
-using System.IO;
-using Windows.ApplicationModel;
 using Windows.ApplicationModel.Activation;
 using Windows.Storage;
 using WinUIEx;
@@ -207,6 +203,9 @@ public async Task InitializeApplicationAsync(object activatedEventArgs)
 				AppWindow.Show();
 				Activate();
 			}
+
+			if (Windows.Win32.PInvoke.IsIconic(new(WindowHandle)))
+				Instance.Restore(); // Restore window if minimized
 		}
 
 		public Frame EnsureWindowIsInitialized()
diff --git a/src/Files.App/NativeMethods.txt b/src/Files.App/NativeMethods.txt
@@ -40,6 +40,7 @@ AttachThreadInput
 SetWindowPos
 SetFocus
 SetActiveWindow
+IsIconic
 CopyFileFromApp
 MoveFileFromApp
 DeleteFileFromApp
diff --git a/src/Files.App/Services/QuickAccessService.cs b/src/Files.App/Services/QuickAccessService.cs
@@ -8,7 +8,9 @@ namespace Files.App.Services
 {
 	internal sealed class QuickAccessService : IQuickAccessService
 	{
-		private readonly static string guid = "::{679f85cb-0220-4080-b29b-5540cc05aab6}";
+		// Quick access shell folder (::{679f85cb-0220-4080-b29b-5540cc05aab6}) contains recent files
+		// which are unnecessary for getting pinned folders, so we use frequent places shell folder instead.
+		private readonly static string guid = "::{3936e9e4-d92c-4eee-a85a-bc16d5ea0819}";
 
 		public async Task<IEnumerable<ShellFileItem>> GetPinnedFoldersAsync()
 		{
diff --git a/src/Files.App/Utils/RecentItem/RecentItems.cs b/src/Files.App/Utils/RecentItem/RecentItems.cs
@@ -109,7 +109,8 @@ public async Task UpdateRecentFoldersAsync()
 		/// </summary>
 		public async Task<List<RecentItem>> ListRecentFilesAsync()
 		{
-			return (await Win32Helper.GetShellFolderAsync(QuickAccessGuid, false, true, 0, int.MaxValue)).Enumerate
+			// Since the maximum number of recent files is 20, we set the count to 20 to avoid loading of unnecessary shell items.
+			return (await Win32Helper.GetShellFolderAsync(QuickAccessGuid, false, true, 0, 20)).Enumerate
 				.Where(link => !link.IsFolder)
 				.Select(link => new RecentItem(link, ShowFileExtensions)).ToList();
 		}
diff --git a/src/Files.App/Utils/RecentItem/RecentItemsManager.cs b/src/Files.App/Utils/RecentItem/RecentItemsManager.cs
@@ -11,7 +11,6 @@ public sealed class RecentItemsManager
 		private static readonly string recentItemsPath = Environment.GetFolderPath(Environment.SpecialFolder.Recent);
 		private static readonly string automaticDestinationsPath = Path.Combine(recentItemsPath, "AutomaticDestinations");
 		private const string QuickAccessJumpListFileName = "5f7b5f1e01b83767.automaticDestinations-ms";
-		private const string QuickAccessGuid = "::{679f85cb-0220-4080-b29b-5540cc05aab6}";
 		private DateTime quickAccessLastReadTime = DateTime.MinValue;
 		private FileSystemWatcher? quickAccessJumpListWatcher;
 
diff --git a/src/Files.App/Utils/Shell/LaunchHelper.cs b/src/Files.App/Utils/Shell/LaunchHelper.cs
@@ -129,6 +129,11 @@ private static async Task<bool> HandleApplicationLaunch(string application, stri
 
 					return true;
 				}
+				catch (Win32Exception ex) when (ex.NativeErrorCode == 50)
+				{
+					// ShellExecute return code 50 (ERROR_NOT_SUPPORTED) for some exes (#15179)
+					return Win32Helper.RunPowershellCommand($"\"{application}\"", false);
+				}
 				catch (Win32Exception)
 				{
 					try
diff --git a/src/Files.App/Views/Layouts/BaseGroupableLayoutPage.cs b/src/Files.App/Views/Layouts/BaseGroupableLayoutPage.cs
@@ -47,6 +47,7 @@ public BaseGroupableLayoutPage() : base()
 		protected abstract void ItemManipulationModel_RemoveSelectedItemInvoked(object? sender, ListedItem e);
 		protected abstract void ItemManipulationModel_FocusSelectedItemsInvoked(object? sender, EventArgs e);
 		protected abstract void ItemManipulationModel_ScrollIntoViewInvoked(object? sender, ListedItem e);
+		protected abstract void ItemManipulationModel_ScrollToTopInvoked(object? sender, EventArgs e);
 		protected abstract void FileList_PreviewKeyDown(object sender, KeyRoutedEventArgs e);
 		protected abstract void EndRename(TextBox textBox);
 
@@ -70,6 +71,7 @@ protected override void HookEvents()
 			ItemManipulationModel.FocusSelectedItemsInvoked += ItemManipulationModel_FocusSelectedItemsInvoked;
 			ItemManipulationModel.StartRenameItemInvoked += ItemManipulationModel_StartRenameItemInvoked;
 			ItemManipulationModel.ScrollIntoViewInvoked += ItemManipulationModel_ScrollIntoViewInvoked;
+			ItemManipulationModel.ScrollToTopInvoked += ItemManipulationModel_ScrollToTopInvoked;
 			ItemManipulationModel.RefreshItemThumbnailInvoked += ItemManipulationModel_RefreshItemThumbnail;
 			ItemManipulationModel.RefreshItemsThumbnailInvoked += ItemManipulationModel_RefreshItemsThumbnail;
 		}
@@ -88,6 +90,7 @@ protected override void UnhookEvents()
 			ItemManipulationModel.FocusSelectedItemsInvoked -= ItemManipulationModel_FocusSelectedItemsInvoked;
 			ItemManipulationModel.StartRenameItemInvoked -= ItemManipulationModel_StartRenameItemInvoked;
 			ItemManipulationModel.ScrollIntoViewInvoked -= ItemManipulationModel_ScrollIntoViewInvoked;
+			ItemManipulationModel.ScrollToTopInvoked -= ItemManipulationModel_ScrollToTopInvoked;
 			ItemManipulationModel.RefreshItemThumbnailInvoked -= ItemManipulationModel_RefreshItemThumbnail;
 			ItemManipulationModel.RefreshItemsThumbnailInvoked -= ItemManipulationModel_RefreshItemsThumbnail;
 		}
diff --git a/src/Files.App/Views/Layouts/ColumnLayoutPage.xaml.cs b/src/Files.App/Views/Layouts/ColumnLayoutPage.xaml.cs
@@ -109,6 +109,11 @@ protected override void ItemManipulationModel_ScrollIntoViewInvoked(object? send
 			}
 		}
 
+		protected override void ItemManipulationModel_ScrollToTopInvoked(object? sender, EventArgs e)
+		{
+			ContentScroller?.ChangeView(null, 0, null, true);
+		}
+
 		protected override void ItemManipulationModel_FocusSelectedItemsInvoked(object? sender, EventArgs e)
 		{
 			if (SelectedItems?.Any() ?? false)
@@ -483,18 +488,7 @@ private async void FileList_ItemTapped(object sender, TappedRoutedEventArgs e)
 					await CommitRenameAsync(textBox);
 				}
 
-				if (isItemFolder && UserSettingsService.FoldersSettingsService.ColumnLayoutOpenFoldersWithOneClick)
-				{
-					ItemInvoked?.Invoke(
-						new ColumnParam
-						{
-							Source = this,
-							NavPathParam = (item is ShortcutItem sht ? sht.TargetPath : item!.ItemPath),
-							ListView = FileList
-						},
-						EventArgs.Empty);
-				}
-				else if (!IsRenamingItem && isItemFile)
+				if (!IsRenamingItem && isItemFile)
 				{
 					CheckDoubleClick(item!);
 				}
diff --git a/src/Files.App/Views/Layouts/DetailsLayoutPage.xaml.cs b/src/Files.App/Views/Layouts/DetailsLayoutPage.xaml.cs
@@ -98,6 +98,11 @@ protected override void ItemManipulationModel_ScrollIntoViewInvoked(object? send
 			ContentScroller?.ChangeView(null, FileList.Items.IndexOf(e) * RowHeight, null, true); // Scroll to index * item height
 		}
 
+		protected override void ItemManipulationModel_ScrollToTopInvoked(object? sender, EventArgs e)
+		{
+			ContentScroller?.ChangeView(null, 0, null, true);
+		}
+
 		protected override void ItemManipulationModel_FocusSelectedItemsInvoked(object? sender, EventArgs e)
 		{
 			if (SelectedItems?.Any() ?? false)
diff --git a/src/Files.App/Views/Layouts/GridLayoutPage.xaml.cs b/src/Files.App/Views/Layouts/GridLayoutPage.xaml.cs
@@ -90,6 +90,14 @@ protected override void ItemManipulationModel_ScrollIntoViewInvoked(object? send
 			FileList.ScrollIntoView(e);
 		}
 
+		protected override void ItemManipulationModel_ScrollToTopInvoked(object? sender, EventArgs e)
+		{
+			if (FolderSettings?.LayoutMode is FolderLayoutModes.ListView)
+				ContentScroller?.ChangeView(0, null, null, true);
+			else
+				ContentScroller?.ChangeView(null, 0, null, true);
+		}
+
 		protected override void ItemManipulationModel_FocusSelectedItemsInvoked(object? sender, EventArgs e)
 		{
 			if (SelectedItems.Any())
diff --git a/src/Files.App/Views/Shells/BaseShellPage.cs b/src/Files.App/Views/Shells/BaseShellPage.cs
@@ -659,6 +659,10 @@ protected void FilesystemViewModel_ItemLoadStatusChanged(object sender, ItemLoad
 					break;
 				case ItemLoadStatusChangedEventArgs.ItemLoadStatus.Complete:
 					SetLoadingIndicatorForTabs(false);
+
+					if (ContentPage is not null)
+						ContentPage.ItemManipulationModel.ScrollToTop();
+
 					ToolbarViewModel.CanRefresh = true;
 					// Select previous directory
 					if (!string.IsNullOrWhiteSpace(e.PreviousDirectory) &&
@@ -694,13 +698,10 @@ protected void FilesystemViewModel_ItemLoadStatusChanged(object sender, ItemLoad
 
 						var itemToSelect = FilesystemViewModel.FilesAndFolders.ToList().FirstOrDefault((item) => item.ItemPath == folderToSelect);
 
-						if (itemToSelect is not null && ContentPage is not null)
+						if (itemToSelect is not null && ContentPage is not null && userSettingsService.FoldersSettingsService.ScrollToPreviousFolderWhenNavigatingUp)
 						{
-							if (userSettingsService.FoldersSettingsService.ScrollToPreviousFolderWhenNavigatingUp)
-							{
-								ContentPage.ItemManipulationModel.SetSelectedItem(itemToSelect);
-								ContentPage.ItemManipulationModel.ScrollIntoView(itemToSelect);
-							}
+							ContentPage.ItemManipulationModel.SetSelectedItem(itemToSelect);
+							ContentPage.ItemManipulationModel.ScrollIntoView(itemToSelect);
 						}
 					}
 					break;

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,9 @@ namespace Files.App.Services`
`8`	`8`	`{`
`9`	`9`	`internal sealed class QuickAccessService : IQuickAccessService`
`10`	`10`	`{`
`11`		`- private readonly static string guid = "::{679f85cb-0220-4080-b29b-5540cc05aab6}";`
	`11`	`+ // Quick access shell folder (::{679f85cb-0220-4080-b29b-5540cc05aab6}) contains recent files`
	`12`	`+ // which are unnecessary for getting pinned folders, so we use frequent places shell folder instead.`
	`13`	`+ private readonly static string guid = "::{3936e9e4-d92c-4eee-a85a-bc16d5ea0819}";`
`12`	`14`
`13`	`15`	`public async Task<IEnumerable<ShellFileItem>> GetPinnedFoldersAsync()`
`14`	`16`	`{`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,8 @@ public async Task UpdateRecentFoldersAsync()`
`109`	`109`	`/// </summary>`
`110`	`110`	`public async Task<List<RecentItem>> ListRecentFilesAsync()`
`111`	`111`	`{`
`112`		`- return (await Win32Helper.GetShellFolderAsync(QuickAccessGuid, false, true, 0, int.MaxValue)).Enumerate`
	`112`	`+ // Since the maximum number of recent files is 20, we set the count to 20 to avoid loading of unnecessary shell items.`
	`113`	`+ return (await Win32Helper.GetShellFolderAsync(QuickAccessGuid, false, true, 0, 20)).Enumerate`
`113`	`114`	`.Where(link => !link.IsFolder)`
`114`	`115`	`.Select(link => new RecentItem(link, ShowFileExtensions)).ToList();`
`115`	`116`	`}`
Original file line number	Diff line number	Diff line change
`@@ -129,6 +129,11 @@ private static async Task<bool> HandleApplicationLaunch(string application, stri`
`129`	`129`
`130`	`130`	`return true;`
`131`	`131`	`}`
	`132`	`+ catch (Win32Exception ex) when (ex.NativeErrorCode == 50)`
	`133`	`+ {`
	`134`	`+ // ShellExecute return code 50 (ERROR_NOT_SUPPORTED) for some exes (#15179)`
	`135`	`+ return Win32Helper.RunPowershellCommand($"\"{application}\"", false);`
	`136`	`+ }`
`132`	`137`	`catch (Win32Exception)`
`133`	`138`	`{`
`134`	`139`	`try`
Original file line number	Diff line number	Diff line change
`@@ -109,6 +109,11 @@ protected override void ItemManipulationModel_ScrollIntoViewInvoked(object? send`
`109`	`109`	`}`
`110`	`110`	`}`
`111`	`111`
	`112`	`+ protected override void ItemManipulationModel_ScrollToTopInvoked(object? sender, EventArgs e)`
	`113`	`+ {`
	`114`	`+ ContentScroller?.ChangeView(null, 0, null, true);`
	`115`	`+ }`
	`116`	`+`
`112`	`117`	`protected override void ItemManipulationModel_FocusSelectedItemsInvoked(object? sender, EventArgs e)`
`113`	`118`	`{`
`114`	`119`	`if (SelectedItems?.Any() ?? false)`
`@@ -483,18 +488,7 @@ private async void FileList_ItemTapped(object sender, TappedRoutedEventArgs e)`
`483`	`488`	`await CommitRenameAsync(textBox);`
`484`	`489`	`}`
`485`	`490`
`486`		`- if (isItemFolder && UserSettingsService.FoldersSettingsService.ColumnLayoutOpenFoldersWithOneClick)`
`487`		`- {`
`488`		`- ItemInvoked?.Invoke(`
`489`		`- new ColumnParam`
`490`		`- {`
`491`		`- Source = this,`
`492`		`- NavPathParam = (item is ShortcutItem sht ? sht.TargetPath : item!.ItemPath),`
`493`		`- ListView = FileList`
`494`		`- },`
`495`		`- EventArgs.Empty);`
`496`		`- }`
`497`		`- else if (!IsRenamingItem && isItemFile)`
	`491`	`+ if (!IsRenamingItem && isItemFile)`
`498`	`492`	`{`
`499`	`493`	`CheckDoubleClick(item!);`
`500`	`494`	`}`
Original file line number	Diff line number	Diff line change
`@@ -98,6 +98,11 @@ protected override void ItemManipulationModel_ScrollIntoViewInvoked(object? send`
`98`	`98`	`ContentScroller?.ChangeView(null, FileList.Items.IndexOf(e) * RowHeight, null, true); // Scroll to index * item height`
`99`	`99`	`}`
`100`	`100`
	`101`	`+ protected override void ItemManipulationModel_ScrollToTopInvoked(object? sender, EventArgs e)`
	`102`	`+ {`
	`103`	`+ ContentScroller?.ChangeView(null, 0, null, true);`
	`104`	`+ }`
	`105`	`+`
`101`	`106`	`protected override void ItemManipulationModel_FocusSelectedItemsInvoked(object? sender, EventArgs e)`
`102`	`107`	`{`
`103`	`108`	`if (SelectedItems?.Any() ?? false)`