Merge branch 'service/2.4.61' into FixReviewFiles

files-community · Apr 9, 2023 · ca06583 · ca06583
2 parents cb68234 + e530ba4
commit ca06583
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 60 deletions.
diff --git a/src/Files.App/UserControls/Widgets/RecentFilesWidget.xaml b/src/Files.App/UserControls/Widgets/RecentFilesWidget.xaml
@@ -51,66 +51,67 @@
 			</ListView.ItemContainerStyle>
 			<ListView.ItemTemplate>
 				<DataTemplate x:DataType="fs:RecentItem">
-					<Grid
-						Padding="2.5"
-						HorizontalAlignment="Stretch"
-						VerticalAlignment="Stretch"
-						AutomationProperties.Name="{x:Bind Name}"
-						ColumnSpacing="14"
-						DataContext="{x:Bind}"
-						RightTapped="Grid_RightTapped"
+					<ListViewItem 
+						RightTapped="ListViewItem_RightTapped"
 						ToolTipService.ToolTip="{x:Bind RecentPath}">
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition Width="Auto" />
-							<ColumnDefinition Width="*" />
-							<ColumnDefinition Width="*" />
-						</Grid.ColumnDefinitions>
-						<FontIcon
-							x:Name="RecentFolderImg"
-							Grid.Column="0"
-							HorizontalAlignment="Center"
-							VerticalAlignment="Center"
-							x:Load="{x:Bind FolderImg}"
-							x:Phase="1"
-							FontSize="24"
-							Foreground="#ffe793"
-							Glyph="&#xE8B7;" />
-						<FontIcon
-							x:Name="EmptyImg"
-							Grid.Column="0"
-							HorizontalAlignment="Center"
-							VerticalAlignment="Center"
-							x:Load="{x:Bind EmptyImgVis}"
-							x:Phase="1"
-							FontSize="24"
-							Glyph="&#xE7C3;" />
-						<Image
-							x:Name="RecentFileImg"
-							Grid.Column="0"
-							Width="24"
-							Height="24"
-							HorizontalAlignment="Center"
-							VerticalAlignment="Center"
-							x:Load="{x:Bind FileIconVis}"
-							x:Phase="1"
-							Source="{x:Bind FileImg, Mode=OneWay}"
-							Stretch="Uniform" />
+						<Grid
+							Padding="2.5"
+							HorizontalAlignment="Stretch"
+							VerticalAlignment="Stretch"
+							AutomationProperties.Name="{x:Bind Name}"
+							ColumnSpacing="14">
+							<Grid.ColumnDefinitions>
+								<ColumnDefinition Width="Auto" />
+								<ColumnDefinition Width="*" />
+								<ColumnDefinition Width="*" />
+							</Grid.ColumnDefinitions>
+							<FontIcon
+								x:Name="RecentFolderImg"
+								Grid.Column="0"
+								HorizontalAlignment="Center"
+								VerticalAlignment="Center"
+								x:Load="{x:Bind FolderImg}"
+								x:Phase="1"
+								FontSize="24"
+								Foreground="#ffe793"
+								Glyph="&#xE8B7;" />
+							<FontIcon
+								x:Name="EmptyImg"
+								Grid.Column="0"
+								HorizontalAlignment="Center"
+								VerticalAlignment="Center"
+								x:Load="{x:Bind EmptyImgVis}"
+								x:Phase="1"
+								FontSize="24"
+								Glyph="&#xE7C3;" />
+							<Image
+								x:Name="RecentFileImg"
+								Grid.Column="0"
+								Width="24"
+								Height="24"
+								HorizontalAlignment="Center"
+								VerticalAlignment="Center"
+								x:Load="{x:Bind FileIconVis}"
+								x:Phase="1"
+								Source="{x:Bind FileImg, Mode=OneWay}"
+								Stretch="Uniform" />
 
-						<TextBlock
-							Grid.Column="1"
-							VerticalAlignment="Center"
-							Text="{x:Bind Name}"
-							TextTrimming="CharacterEllipsis"
-							TextWrapping="NoWrap" />
+							<TextBlock
+								Grid.Column="1"
+								VerticalAlignment="Center"
+								Text="{x:Bind Name}"
+								TextTrimming="CharacterEllipsis"
+								TextWrapping="NoWrap" />
 
-						<TextBlock
-							Grid.Column="2"
-							VerticalAlignment="Center"
-							FontSize="12"
-							Text="{x:Bind RecentPath}"
-							TextTrimming="CharacterEllipsis"
-							TextWrapping="NoWrap" />
-					</Grid>
+							<TextBlock
+								Grid.Column="2"
+								VerticalAlignment="Center"
+								FontSize="12"
+								Text="{x:Bind RecentPath}"
+								TextTrimming="CharacterEllipsis"
+								TextWrapping="NoWrap" />
+						</Grid>
+					</ListViewItem>
 				</DataTemplate>
 			</ListView.ItemTemplate>
 		</ListView>

diff --git a/src/Files.App/UserControls/Widgets/RecentFilesWidget.xaml.cs b/src/Files.App/UserControls/Widgets/RecentFilesWidget.xaml.cs
@@ -101,11 +101,11 @@ public RecentFilesWidget()
 			OpenFileLocationCommand = new RelayCommand<RecentItem>(OpenFileLocation);
 		}
 
-		private void Grid_RightTapped(object sender, RightTappedRoutedEventArgs e)
+		private void ListViewItem_RightTapped(object sender, RightTappedRoutedEventArgs e)
 		{
 			var itemContextMenuFlyout = new CommandBarFlyout { Placement = FlyoutPlacementMode.Full };
 			itemContextMenuFlyout.Opening += (sender, e) => App.LastOpenedFlyout = sender as CommandBarFlyout;
-			if (sender is not Grid recentItemsGrid || recentItemsGrid.DataContext is not RecentItem item)
+			if (sender is not ListViewItem listViewItem || listViewItem.DataContext is not RecentItem item)
 				return;
 
 			var menuItems = GetItemMenuItems(item, false);
@@ -115,7 +115,7 @@ private void Grid_RightTapped(object sender, RightTappedRoutedEventArgs e)
 							 .ForEach(i => i.MinWidth = Constants.UI.ContextMenuItemsMaxWidth);
 
 			secondaryElements.ForEach(i => itemContextMenuFlyout.SecondaryCommands.Add(i));
-			itemContextMenuFlyout.ShowAt(recentItemsGrid, new FlyoutShowOptions { Position = e.GetPosition(recentItemsGrid) });
+			itemContextMenuFlyout.ShowAt(listViewItem, new FlyoutShowOptions { Position = e.GetPosition(listViewItem) });
 
 			_ = ShellContextmenuHelper.LoadShellMenuItems(item.Path, itemContextMenuFlyout, showOpenWithMenu: true, showSendToMenu: true);