Fix: Fixed issue where multiselect broke open with single click (#11131)

Author: yaira2

src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml.cs

@@ -15,6 +15,7 @@
 using Microsoft.UI.Xaml.Media;
 using Microsoft.UI.Xaml.Navigation;
 using System;
+using System.Globalization;
 using System.Linq;
 using UWPToWinAppSDKUpgradeHelpers;
 using Windows.Foundation;
@@ -417,28 +418,34 @@ private async void ReloadItemIcons()
 
 		private async void FileList_ItemTapped(object sender, TappedRoutedEventArgs e)
 		{
+			var clickedItem = e.OriginalSource as FrameworkElement;
 			var ctrlPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Control).HasFlag(CoreVirtualKeyStates.Down);
 			var shiftPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Shift).HasFlag(CoreVirtualKeyStates.Down);
 			var item = (e.OriginalSource as FrameworkElement)?.DataContext as ListedItem;
 			if (item is null)
 				return;
+
 			// Skip code if the control or shift key is pressed or if the user is using multiselect
-			if (ctrlPressed || shiftPressed || AppModel.ShowSelectionCheckboxes)
+			if
+			(
+				ctrlPressed ||
+				shiftPressed ||
+				AppModel.ShowSelectionCheckboxes && !UserSettingsService.FoldersSettingsService.OpenItemsWithOneClick ||
+				clickedItem is Microsoft.UI.Xaml.Shapes.Rectangle
+			)
 			{
 				e.Handled = true;
 				return;
 			}
 
 			// Check if the setting to open items with a single click is turned on
-			if (item is not null
-				&& UserSettingsService.FoldersSettingsService.OpenItemsWithOneClick)
+			if (UserSettingsService.FoldersSettingsService.OpenItemsWithOneClick)
 			{
 				ResetRenameDoubleClick();
 				_ = NavigationHelpers.OpenSelectedItems(ParentShellPageInstance, false);
 			}
 			else
 			{
-				var clickedItem = e.OriginalSource as FrameworkElement;
 				if (clickedItem is TextBlock && ((TextBlock)clickedItem).Name == "ItemName")
 				{
 					CheckRenameDoubleClick(clickedItem?.DataContext);

src/Files.App/Views/LayoutModes/GridViewBrowser.xaml.cs

@@ -378,6 +378,7 @@ private async void ReloadSelectedItemsIcon()
 
 		private async void FileList_ItemTapped(object sender, TappedRoutedEventArgs e)
 		{
+			var clickedItem = e.OriginalSource as FrameworkElement;
 			var ctrlPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Control).HasFlag(CoreVirtualKeyStates.Down);
 			var shiftPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Shift).HasFlag(CoreVirtualKeyStates.Down);
 
@@ -386,19 +387,26 @@ private async void FileList_ItemTapped(object sender, TappedRoutedEventArgs e)
 				return;
 
 			// Skip code if the control or shift key is pressed or if the user is using multiselect
-			if (ctrlPressed || shiftPressed || AppModel.ShowSelectionCheckboxes)
+			if
+			(
+				ctrlPressed ||
+				shiftPressed ||
+				AppModel.ShowSelectionCheckboxes && !UserSettingsService.FoldersSettingsService.OpenItemsWithOneClick ||
+				clickedItem is Microsoft.UI.Xaml.Shapes.Rectangle
+			)
+			{
+				e.Handled = true;
 				return;
+			}
 
 			// Check if the setting to open items with a single click is turned on
-			if (item is not null
-				&& UserSettingsService.FoldersSettingsService.OpenItemsWithOneClick)
+			if (UserSettingsService.FoldersSettingsService.OpenItemsWithOneClick)
 			{
 				ResetRenameDoubleClick();
 				_ = NavigationHelpers.OpenSelectedItems(ParentShellPageInstance, false);
 			}
 			else
 			{
-				var clickedItem = e.OriginalSource as FrameworkElement;
 				if (clickedItem is TextBlock textBlock && textBlock.Name == "ItemName")
 				{
 					CheckRenameDoubleClick(clickedItem?.DataContext);