Fixes an issue for which "close tab to the right" was sometimes improperly enabled (#4198)

Author: gave92

Files/App.xaml.cs

@@ -141,20 +141,6 @@ private void OnLeavingBackground(object sender, LeavingBackgroundEventArgs e)
             DrivesManager?.ResumeDeviceWatcher();
         }
 
-        public static INavigationControlItem RightClickedItem;
-
-        public static void UnpinItem_Click(object sender, RoutedEventArgs e)
-        {
-            if (RightClickedItem.Path.Equals(AppSettings.RecycleBinPath, StringComparison.OrdinalIgnoreCase))
-            {
-                AppSettings.PinRecycleBinToSideBar = false;
-            }
-            else if (RightClickedItem.Section == SectionType.Favorites)
-            {
-                SidebarPinnedController.Model.RemoveItem(RightClickedItem.Path.ToString());
-            }
-        }
-
         public static Windows.UI.Xaml.UnhandledExceptionEventArgs ExceptionInfo { get; set; }
         public static string ExceptionStackTrace { get; set; }
         public static List<string> pathsToDeleteAfterPaste = new List<string>();

Files/UserControls/MultitaskingControl/HorizontalMultitaskingControl.xaml

@@ -49,10 +49,11 @@
                             </MenuFlyoutItem.Icon>
                         </MenuFlyoutItem>
                         <MenuFlyoutItem
+                            x:Name="MenuItemCloseTabsToTheRight"
                             x:Uid="HorizontalMultitaskingControlCloseTabsToTheRight"
                             Click="{x:Bind views:MainPage.CloseTabsToTheRight}"
                             Text="Close tabs to the right"
-                            IsEnabled="{x:Bind CloseTabsToTheRightEnabled, Mode=OneWay}"/>
+                            DataContextChanged="MenuItemCloseTabsToTheRight_DataContextChanged" />
                     </MenuFlyout>
                 </ResourceDictionary>
                 <ResourceDictionary>

Files/UserControls/MultitaskingControl/HorizontalMultitaskingControl.xaml.cs

@@ -21,20 +21,6 @@ public sealed partial class HorizontalMultitaskingControl : BaseMultitaskingCont
 
         private SettingsViewModel AppSettings => App.AppSettings;
 
-        private bool closeTabsToTheRightEnabled = true;
-        public bool CloseTabsToTheRightEnabled
-        {
-            get => closeTabsToTheRightEnabled;
-            private set
-            {
-                if (value != closeTabsToTheRightEnabled)
-                {
-                    closeTabsToTheRightEnabled = value;
-                    OnPropertyChanged();
-                }
-            }
-        }
-
         public HorizontalMultitaskingControl()
         {
             InitializeComponent();
@@ -187,24 +173,27 @@ private async void TabStrip_TabDroppedOutside(TabView sender, TabViewTabDroppedO
 
         private void TabItemContextMenu_Opening(object sender, object e)
         {
-            TabItem tabItem = (((MenuFlyout)sender).Items.First()).DataContext as TabItem;
-
-            if (MainPage.AppInstances.IndexOf(tabItem) == MainPage.AppInstances.Count - 1)
+            if (MainPage.MultitaskingControl.Items.Count == 1)
             {
-                CloseTabsToTheRightEnabled = false;
+                MenuItemMoveTabToNewWindow.IsEnabled = false;
             }
             else
             {
-                CloseTabsToTheRightEnabled = true;
+                MenuItemMoveTabToNewWindow.IsEnabled = true;
             }
+        }
 
-            if (MainPage.MultitaskingControl.Items.Count == 1)
+        private void MenuItemCloseTabsToTheRight_DataContextChanged(FrameworkElement sender, DataContextChangedEventArgs args)
+        {
+            TabItem tabItem = args.NewValue as TabItem;
+
+            if (MainPage.AppInstances.IndexOf(tabItem) == MainPage.AppInstances.Count - 1)
             {
-                MenuItemMoveTabToNewWindow.IsEnabled = false;
+                MenuItemCloseTabsToTheRight.IsEnabled = false;
             }
             else
             {
-                MenuItemMoveTabToNewWindow.IsEnabled = true;
+                MenuItemCloseTabsToTheRight.IsEnabled = true;
             }
         }
     }

Files/UserControls/SidebarControl.xaml

@@ -186,7 +186,7 @@
                                 x:Name="UnpinItem"
                                 x:Uid="SideBarUnpinFromSideBar"
                                 x:Load="{x:Bind ShowUnpinItem, Mode=OneWay}"
-                                Click="{x:Bind local1:App.UnpinItem_Click}"
+                                Click="{x:Bind UnpinItem_Click}"
                                 Text="Unpin from Sidebar">
                                 <MenuFlyoutItem.Icon>
                                     <FontIcon Glyph="&#xE77A;" />

Files/UserControls/SidebarControl.xaml.cs

@@ -194,13 +194,27 @@ public bool RecycleBinHasItems
             }
         }
 
+        public INavigationControlItem RightClickedItem;
+
         public event PropertyChangedEventHandler PropertyChanged;
 
         private void NotifyPropertyChanged([CallerMemberName] string propertyName = "")
         {
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
 
+        public void UnpinItem_Click(object sender, RoutedEventArgs e)
+        {
+            if (RightClickedItem.Path.Equals(AppSettings.RecycleBinPath, StringComparison.OrdinalIgnoreCase))
+            {
+                AppSettings.PinRecycleBinToSideBar = false;
+            }
+            else if (RightClickedItem.Section == SectionType.Favorites)
+            {
+                App.SidebarPinnedController.Model.RemoveItem(RightClickedItem.Path.ToString());
+            }
+        }
+
         private void Sidebar_ItemInvoked(Microsoft.UI.Xaml.Controls.NavigationView sender, Microsoft.UI.Xaml.Controls.NavigationViewItemInvokedEventArgs args)
         {
             if (args.InvokedItem == null || args.InvokedItemContainer == null)
@@ -245,8 +259,8 @@ private void NavigationViewLocationItem_RightTapped(object sender, RightTappedRo
                     }
                 }
 
+                RightClickedItem = item;
                 SideBarItemContextFlyout.ShowAt(sidebarItem, e.GetPosition(sidebarItem));
-                App.RightClickedItem = item;
             }
 
             e.Handled = true;
@@ -264,7 +278,7 @@ private void NavigationViewDriveItem_RightTapped(object sender, RightTappedRoute
 
             SideBarItemContextFlyout.ShowAt(sidebarItem, e.GetPosition(sidebarItem));
 
-            App.RightClickedItem = item;
+            RightClickedItem = item;
 
             e.Handled = true;
         }
@@ -281,19 +295,19 @@ private void NavigationViewWSLItem_RightTapped(object sender, RightTappedRoutedE
 
             SideBarItemContextFlyout.ShowAt(sidebarItem, e.GetPosition(sidebarItem));
 
-            App.RightClickedItem = item;
+            RightClickedItem = item;
 
             e.Handled = true;
         }
 
         private void OpenInNewTab_Click(object sender, RoutedEventArgs e)
         {
-            Interaction.OpenPathInNewTab(App.RightClickedItem.Path);
+            Interaction.OpenPathInNewTab(RightClickedItem.Path);
         }
 
         private async void OpenInNewWindow_Click(object sender, RoutedEventArgs e)
         {
-            await Interaction.OpenPathInNewWindowAsync(App.RightClickedItem.Path);
+            await Interaction.OpenPathInNewWindowAsync(RightClickedItem.Path);
         }
 
         private void NavigationViewItem_DragStarting(UIElement sender, DragStartingEventArgs args)
@@ -555,7 +569,7 @@ private void SettingsButton_Tapped(object sender, TappedRoutedEventArgs e)
 
         private async void EjectDevice_Click(object sender, RoutedEventArgs e)
         {
-            await DeviceHelpers.EjectDeviceAsync(App.RightClickedItem.Path);
+            await DeviceHelpers.EjectDeviceAsync(RightClickedItem.Path);
         }
 
         private void SidebarNavView_Loaded(object sender, RoutedEventArgs e)

Files/Views/MainPage.xaml.cs

@@ -189,7 +189,7 @@ public static async void DuplicateTabAtIndex(object sender, RoutedEventArgs e)
             }
         }
 
-        public static async void CloseTabsToTheRight(object sender, RoutedEventArgs e)
+        public static void CloseTabsToTheRight(object sender, RoutedEventArgs e)
         {
             TabItem tabItem = ((FrameworkElement)sender).DataContext as TabItem;
             int index = AppInstances.IndexOf(tabItem);