Fix: Fixed issue where the properties window could not be opened on t…

…he home page (files-community#14385)
marcelwgn · Jan 8, 2024 · 35cc6ad · 35cc6ad
1 parent bc00d61
commit 35cc6ad
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 11 deletions.
diff --git a/src/Files.App/UserControls/Widgets/DrivesWidget.xaml.cs b/src/Files.App/UserControls/Widgets/DrivesWidget.xaml.cs
@@ -298,14 +298,15 @@ private void OpenProperties(DriveCardItem item)
 			if (!HomePageContext.IsAnyItemRightClicked)
 				return;
 
+			var flyout = HomePageContext.ItemContextFlyoutMenu;
 			EventHandler<object> flyoutClosed = null!;
 			flyoutClosed = (s, e) =>
 			{
-				HomePageContext.ItemContextFlyoutMenu!.Closed -= flyoutClosed;
+				flyout!.Closed -= flyoutClosed;
 				FilePropertiesHelpers.OpenPropertiesWindow(item.Item, associatedInstance);
 			};
 
-			HomePageContext.ItemContextFlyoutMenu!.Closed += flyoutClosed;
+			flyout!.Closed += flyoutClosed;
 		}
 
 		private async void Button_Click(object sender, RoutedEventArgs e)

diff --git a/src/Files.App/UserControls/Widgets/FileTagsWidget.xaml.cs b/src/Files.App/UserControls/Widgets/FileTagsWidget.xaml.cs
@@ -72,10 +72,11 @@ private void OpenProperties(WidgetCardItem? item)
 			if (!HomePageContext.IsAnyItemRightClicked)
 				return;
 
+			var flyout = HomePageContext.ItemContextFlyoutMenu;
 			EventHandler<object> flyoutClosed = null!;
 			flyoutClosed = (s, e) =>
 			{
-				HomePageContext.ItemContextFlyoutMenu!.Closed -= flyoutClosed;
+				flyout!.Closed -= flyoutClosed;
 
 				ListedItem listedItem = new(null!)
 				{
@@ -87,7 +88,7 @@ private void OpenProperties(WidgetCardItem? item)
 				FilePropertiesHelpers.OpenPropertiesWindow(listedItem, AppInstance);
 			};
 
-			HomePageContext.ItemContextFlyoutMenu!.Closed += flyoutClosed;
+			flyout!.Closed += flyoutClosed;
 		}
 
 		private void OpenInNewPane(WidgetCardItem? item)
@@ -119,7 +120,7 @@ private void AdaptiveGridView_RightTapped(object sender, RightTappedRoutedEventA
 
 			// Hook events
 			itemContextMenuFlyout.Opening += (sender, e) => App.LastOpenedFlyout = sender as CommandBarFlyout;
-			itemContextMenuFlyout.Opened += (sender, e) => OnRightClickedItemChanged(null, null);
+			itemContextMenuFlyout.Closed += (sender, e) => OnRightClickedItemChanged(null, null);
 
 			FlyoutItemPath = item.Path;
 

diff --git a/src/Files.App/UserControls/Widgets/HomePageWidget.cs b/src/Files.App/UserControls/Widgets/HomePageWidget.cs
@@ -59,7 +59,7 @@ public void Button_RightTapped(object sender, RightTappedRoutedEventArgs e)
 
 			// Hook events
 			itemContextMenuFlyout.Opening += (sender, e) => App.LastOpenedFlyout = sender as CommandBarFlyout;
-			itemContextMenuFlyout.Opened += (sender, e) => OnRightClickedItemChanged(null, null);
+			itemContextMenuFlyout.Closed += (sender, e) => OnRightClickedItemChanged(null, null);
 
 			FlyoutItemPath = item.Path;
 

diff --git a/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml.cs b/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml.cs
@@ -368,15 +368,16 @@ private void OpenProperties(FolderCardItem item)
 			if (!HomePageContext.IsAnyItemRightClicked)
 				return;
 
+			var flyout = HomePageContext.ItemContextFlyoutMenu;
 			EventHandler<object> flyoutClosed = null!;
 
 			flyoutClosed = (s, e) =>
 			{
-				HomePageContext.ItemContextFlyoutMenu!.Closed -= flyoutClosed;
+				flyout!.Closed -= flyoutClosed;
 				CardPropertiesInvoked?.Invoke(this, new QuickAccessCardEventArgs { Item = item.Item });
 			};
 
-			HomePageContext.ItemContextFlyoutMenu!.Closed += flyoutClosed;
+			flyout!.Closed += flyoutClosed;
 		}
 
 		public override async Task PinToFavoritesAsync(WidgetCardItem item)

diff --git a/src/Files.App/UserControls/Widgets/RecentFilesWidget.xaml.cs b/src/Files.App/UserControls/Widgets/RecentFilesWidget.xaml.cs
@@ -124,7 +124,7 @@ private void ListView_RightTapped(object sender, RightTappedRoutedEventArgs e)
 
 			// Hook events
 			itemContextMenuFlyout.Opening += (sender, e) => App.LastOpenedFlyout = sender as CommandBarFlyout;
-			itemContextMenuFlyout.Opened += (sender, e) => OnRightClickedItemChanged(null, null);
+			itemContextMenuFlyout.Closed += (sender, e) => OnRightClickedItemChanged(null, null);
 
 			FlyoutItemPath = item.Path;
 
@@ -242,14 +242,15 @@ private void OpenFileLocation(RecentItem item)
 
 		private void OpenProperties(RecentItem item)
 		{
+			var flyout = HomePageContext.ItemContextFlyoutMenu;
 			EventHandler<object> flyoutClosed = null!;
 			flyoutClosed = async (s, e) =>
 			{
-				HomePageContext.ItemContextFlyoutMenu!.Closed -= flyoutClosed;
+				flyout!.Closed -= flyoutClosed;
 				var listedItem = await UniversalStorageEnumerator.AddFileAsync(await BaseStorageFile.GetFileFromPathAsync(item.Path), null, default);
 				FilePropertiesHelpers.OpenPropertiesWindow(listedItem, associatedInstance);
 			};
-			HomePageContext.ItemContextFlyoutMenu!.Closed += flyoutClosed;
+			flyout!.Closed += flyoutClosed;
 		}
 
 		private async Task UpdateRecentsListAsync(NotifyCollectionChangedEventArgs e)