Skip to content

Commit 35cc6ad

Browse files
authored
Fix: Fixed issue where the properties window could not be opened on the home page (#14385)
1 parent bc00d61 commit 35cc6ad

File tree

5 files changed

+15
-11
lines changed

5 files changed

+15
-11
lines changed

src/Files.App/UserControls/Widgets/DrivesWidget.xaml.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,14 +298,15 @@ private void OpenProperties(DriveCardItem item)
298298
if (!HomePageContext.IsAnyItemRightClicked)
299299
return;
300300

301+
var flyout = HomePageContext.ItemContextFlyoutMenu;
301302
EventHandler<object> flyoutClosed = null!;
302303
flyoutClosed = (s, e) =>
303304
{
304-
HomePageContext.ItemContextFlyoutMenu!.Closed -= flyoutClosed;
305+
flyout!.Closed -= flyoutClosed;
305306
FilePropertiesHelpers.OpenPropertiesWindow(item.Item, associatedInstance);
306307
};
307308

308-
HomePageContext.ItemContextFlyoutMenu!.Closed += flyoutClosed;
309+
flyout!.Closed += flyoutClosed;
309310
}
310311

311312
private async void Button_Click(object sender, RoutedEventArgs e)

src/Files.App/UserControls/Widgets/FileTagsWidget.xaml.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,11 @@ private void OpenProperties(WidgetCardItem? item)
7272
if (!HomePageContext.IsAnyItemRightClicked)
7373
return;
7474

75+
var flyout = HomePageContext.ItemContextFlyoutMenu;
7576
EventHandler<object> flyoutClosed = null!;
7677
flyoutClosed = (s, e) =>
7778
{
78-
HomePageContext.ItemContextFlyoutMenu!.Closed -= flyoutClosed;
79+
flyout!.Closed -= flyoutClosed;
7980

8081
ListedItem listedItem = new(null!)
8182
{
@@ -87,7 +88,7 @@ private void OpenProperties(WidgetCardItem? item)
8788
FilePropertiesHelpers.OpenPropertiesWindow(listedItem, AppInstance);
8889
};
8990

90-
HomePageContext.ItemContextFlyoutMenu!.Closed += flyoutClosed;
91+
flyout!.Closed += flyoutClosed;
9192
}
9293

9394
private void OpenInNewPane(WidgetCardItem? item)
@@ -119,7 +120,7 @@ private void AdaptiveGridView_RightTapped(object sender, RightTappedRoutedEventA
119120

120121
// Hook events
121122
itemContextMenuFlyout.Opening += (sender, e) => App.LastOpenedFlyout = sender as CommandBarFlyout;
122-
itemContextMenuFlyout.Opened += (sender, e) => OnRightClickedItemChanged(null, null);
123+
itemContextMenuFlyout.Closed += (sender, e) => OnRightClickedItemChanged(null, null);
123124

124125
FlyoutItemPath = item.Path;
125126

src/Files.App/UserControls/Widgets/HomePageWidget.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public void Button_RightTapped(object sender, RightTappedRoutedEventArgs e)
5959

6060
// Hook events
6161
itemContextMenuFlyout.Opening += (sender, e) => App.LastOpenedFlyout = sender as CommandBarFlyout;
62-
itemContextMenuFlyout.Opened += (sender, e) => OnRightClickedItemChanged(null, null);
62+
itemContextMenuFlyout.Closed += (sender, e) => OnRightClickedItemChanged(null, null);
6363

6464
FlyoutItemPath = item.Path;
6565

src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -368,15 +368,16 @@ private void OpenProperties(FolderCardItem item)
368368
if (!HomePageContext.IsAnyItemRightClicked)
369369
return;
370370

371+
var flyout = HomePageContext.ItemContextFlyoutMenu;
371372
EventHandler<object> flyoutClosed = null!;
372373

373374
flyoutClosed = (s, e) =>
374375
{
375-
HomePageContext.ItemContextFlyoutMenu!.Closed -= flyoutClosed;
376+
flyout!.Closed -= flyoutClosed;
376377
CardPropertiesInvoked?.Invoke(this, new QuickAccessCardEventArgs { Item = item.Item });
377378
};
378379

379-
HomePageContext.ItemContextFlyoutMenu!.Closed += flyoutClosed;
380+
flyout!.Closed += flyoutClosed;
380381
}
381382

382383
public override async Task PinToFavoritesAsync(WidgetCardItem item)

src/Files.App/UserControls/Widgets/RecentFilesWidget.xaml.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ private void ListView_RightTapped(object sender, RightTappedRoutedEventArgs e)
124124

125125
// Hook events
126126
itemContextMenuFlyout.Opening += (sender, e) => App.LastOpenedFlyout = sender as CommandBarFlyout;
127-
itemContextMenuFlyout.Opened += (sender, e) => OnRightClickedItemChanged(null, null);
127+
itemContextMenuFlyout.Closed += (sender, e) => OnRightClickedItemChanged(null, null);
128128

129129
FlyoutItemPath = item.Path;
130130

@@ -242,14 +242,15 @@ private void OpenFileLocation(RecentItem item)
242242

243243
private void OpenProperties(RecentItem item)
244244
{
245+
var flyout = HomePageContext.ItemContextFlyoutMenu;
245246
EventHandler<object> flyoutClosed = null!;
246247
flyoutClosed = async (s, e) =>
247248
{
248-
HomePageContext.ItemContextFlyoutMenu!.Closed -= flyoutClosed;
249+
flyout!.Closed -= flyoutClosed;
249250
var listedItem = await UniversalStorageEnumerator.AddFileAsync(await BaseStorageFile.GetFileFromPathAsync(item.Path), null, default);
250251
FilePropertiesHelpers.OpenPropertiesWindow(listedItem, associatedInstance);
251252
};
252-
HomePageContext.ItemContextFlyoutMenu!.Closed += flyoutClosed;
253+
flyout!.Closed += flyoutClosed;
253254
}
254255

255256
private async Task UpdateRecentsListAsync(NotifyCollectionChangedEventArgs e)

0 commit comments

Comments
 (0)