Fixed: Properties window opens behind main app window (#9973)

Author: ferrariofilippo

src/Files.App/IBaseLayout.cs

@@ -1,6 +1,7 @@
 using Files.App.Filesystem;
 using Files.App.Interacts;
 using Files.App.ViewModels;
+using Microsoft.UI.Xaml.Controls;
 using System;
 using System.Collections.Generic;
 
@@ -25,5 +26,6 @@ public interface IBaseLayout : IDisposable
         public SelectedItemsPropertiesViewModel SelectedItemsPropertiesViewModel { get; }
         public DirectoryPropertiesViewModel DirectoryPropertiesViewModel { get; }
         public BaseLayoutCommandsViewModel CommandsViewModel { get; }
+        public CommandBarFlyout ItemContextMenuFlyout { get; set; }
     }
 }

src/Files.App/Interacts/BaseLayoutCommandImplementationModel.cs

@@ -196,11 +196,17 @@ public virtual async void DeleteItem(RoutedEventArgs e)
 
         public virtual void ShowFolderProperties(RoutedEventArgs e)
         {
-            FilePropertiesHelpers.ShowProperties(associatedInstance);
+            SlimContentPage.ItemContextMenuFlyout.Closed += OpenProperties;
         }
 
         public virtual void ShowProperties(RoutedEventArgs e)
         {
+            SlimContentPage.ItemContextMenuFlyout.Closed += OpenProperties;
+        }
+
+        private void OpenProperties(object sender, object e)
+        {
+            SlimContentPage.ItemContextMenuFlyout.Closed -= OpenProperties;
             FilePropertiesHelpers.ShowProperties(associatedInstance);
         }
 

src/Files.App/UserControls/SidebarControl.xaml.cs

@@ -29,6 +29,7 @@
 using CommunityToolkit.WinUI.UI;
 using Microsoft.UI.Input;
 using UWPToWinAppSDKUpgradeHelpers;
+using Windows.ApplicationModel.Search.Core;
 
 namespace Files.App.UserControls
 {
@@ -58,6 +59,8 @@ public sealed partial class SidebarControl : NavigationView, INotifyPropertyChan
 
         private bool isDropOnProcess = false;
 
+        private bool wasOpenPropertiesSelected = false;
+
         /// <summary>
         /// true if the user is currently resizing the sidebar
         /// </summary>
@@ -490,14 +493,23 @@ private void MoveItemToBottom()
 
         private void OpenProperties()
         {
-            SidebarItemPropertiesInvoked?.Invoke(this, new SidebarItemPropertiesInvokedEventArgs(rightClickedItem));
+            wasOpenPropertiesSelected = true;
         }
 
         private async void EjectDevice()
         {
             await DriveHelpers.EjectDeviceAsync(rightClickedItem.Path);
         }
 
+        private void Flyout_Closed(object sender, object e)
+        {
+            ((CommandBarFlyout)sender).Closed -= Flyout_Closed;
+            if (!wasOpenPropertiesSelected)
+                return;
+            SidebarItemPropertiesInvoked?.Invoke(this, new SidebarItemPropertiesInvokedEventArgs(rightClickedItem));
+            wasOpenPropertiesSelected = false;
+        }
+
         private async void Sidebar_ItemInvoked(NavigationView sender, NavigationViewItemInvokedEventArgs args)
         {
             if (IsInPointerPressed || args.InvokedItem == null || args.InvokedItemContainer == null)
@@ -555,6 +567,8 @@ private void NavigationViewItem_RightTapped(object sender, RightTappedRoutedEven
 
             rightClickedItem = item;
 
+            itemContextMenuFlyout.Closed += Flyout_Closed;
+
             var menuItems = GetLocationItemMenuItems(item);
             var (_, secondaryElements) = ItemModelListToContextFlyoutHelper.GetAppBarItemsFromModel(menuItems);
 

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

@@ -77,7 +77,8 @@
 						Tag="{x:Bind Item.Path}"
 						ToolTipService.ToolTip="{x:Bind Item.Text, Mode=OneWay}">
 						<Button.ContextFlyout>
-							<MenuFlyout Opening="MenuFlyout_Opening">
+							<MenuFlyout Opening="MenuFlyout_Opening"
+                                        Closed="MenuFlyout_Closed">
 								<MenuFlyout.Items>
 									<MenuFlyoutItem
 										x:Name="OpenInNewPane"

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

@@ -92,6 +92,8 @@ public IShellPage AppInstance
             }
         }
 
+        private DriveItem? propertiesItem = null;
+
         public string WidgetName => nameof(DrivesWidget);
 
         public string AutomationProperties => "DrivesWidgetAutomationProperties/Name".GetLocalizedResource();
@@ -189,8 +191,7 @@ private async void UnpinFromFavorites_Click(object sender, RoutedEventArgs e)
 
         private async void OpenDriveProperties_Click(object sender, RoutedEventArgs e)
         {
-            var item = ((MenuFlyoutItem)sender).DataContext as DriveItem;
-            await FilePropertiesHelpers.OpenPropertiesWindowAsync(item, associatedInstance);
+            propertiesItem = ((MenuFlyoutItem)sender).DataContext as DriveItem;
         }
 
         private async void Button_Click(object sender, RoutedEventArgs e)
@@ -329,5 +330,13 @@ public void Dispose()
         {
 
         }
+
+        private async void MenuFlyout_Closed(object sender, object e)
+        {
+            if (propertiesItem is null)
+                return;
+            await FilePropertiesHelpers.OpenPropertiesWindowAsync(propertiesItem, associatedInstance);
+            propertiesItem = null;
+        }
     }
 }

src/Files.App/UserControls/Widgets/FolderWidget.xaml

@@ -39,7 +39,8 @@
 						PointerPressed="Button_PointerPressed"
 						Tag="{x:Bind Path}">
 						<Button.ContextFlyout>
-							<MenuFlyout Opening="MenuFlyout_Opening">
+							<MenuFlyout Opening="MenuFlyout_Opening"
+                                        Closed="MenuFlyout_Closed">
 								<MenuFlyout.Items>
 									<MenuFlyoutItem
 										x:Name="OpenInNewPane"

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

@@ -88,6 +88,8 @@ public sealed partial class FolderWidget : UserControl, IWidgetItemModel, INotif
         public BulkConcurrentObservableCollection<FolderCardItem> ItemsAdded = new BulkConcurrentObservableCollection<FolderCardItem>();
         private bool showMultiPaneControls;
 
+        private FolderCardItem? propertiesItem = null;
+
         public FolderWidget()
         {
             InitializeComponent();
@@ -239,11 +241,7 @@ private async void OpenInNewWindow_Click(object sender, RoutedEventArgs e)
 
         private void OpenLibraryProperties_Click(object sender, RoutedEventArgs e)
         {
-            var item = (sender as MenuFlyoutItem).DataContext as FolderCardItem;
-            if (item.IsLibrary)
-            {
-                LibraryCardPropertiesInvoked?.Invoke(this, new LibraryCardEventArgs { Library = item.Item as LibraryLocationItem });
-            }
+            propertiesItem = (sender as MenuFlyoutItem)?.DataContext as FolderCardItem;
         }
 
         private async Task OpenLibraryCard(FolderCardItem item)
@@ -277,5 +275,14 @@ public void Dispose()
         {
 
         }
+
+        private void MenuFlyout_Closed(object sender, object e)
+        {
+            if (propertiesItem is null || !propertiesItem.IsLibrary)
+                return;
+
+            LibraryCardPropertiesInvoked?.Invoke(this, new LibraryCardEventArgs { Library = (propertiesItem.Item as LibraryLocationItem)! });
+            propertiesItem = null;
+        }
     }
 }