Switch to new tab when one is opened (#2061)

Author: tsvietOK

Files/UserControls/MultitaskingControl/HorizontalMultitaskingControl.xaml.cs

@@ -25,6 +25,8 @@ namespace Files.UserControls
     public sealed partial class HorizontalMultitaskingControl : UserControl, IMultitaskingControl
     {
         private const string TabDropHandledIdentifier = "FilesTabViewItemDropHandled";
+        private readonly DispatcherTimer tabHoverTimer = new DispatcherTimer();
+        private TabViewItem hoveredTabViewItem = null;
 
         public const string TabPathIdentifier = "FilesTabViewItemPath";
 
@@ -33,10 +35,7 @@ public sealed partial class HorizontalMultitaskingControl : UserControl, IMultit
         public void SelectionChanged() => TabStrip_SelectionChanged(null, null);
 
         public ObservableCollection<TabItem> Items => MainPage.AppInstances;
-
-        private readonly DispatcherTimer tabHoverTimer = new DispatcherTimer();
-        private TabViewItem hoveredTabViewItem = null;
-
+        
         public HorizontalMultitaskingControl()
         {
             this.InitializeComponent();
@@ -225,7 +224,7 @@ private void HorizontalTabView_TabItemsChanged(TabView sender, Windows.Foundatio
                     break;
 
                 case Windows.Foundation.Collections.CollectionChange.ItemInserted:
-                    App.InteractionViewModel.TabStripSelectedIndex = Items.IndexOf(HorizontalTabView.SelectedItem as TabItem);
+                    App.InteractionViewModel.TabStripSelectedIndex = (int)args.Index;
                     break;
             }
         }
@@ -279,7 +278,9 @@ private void TabHoverSelected(object sender, object e)
         {
             tabHoverTimer.Stop();
             if (hoveredTabViewItem != null)
+            {
                 HorizontalTabView.SelectedItem = hoveredTabViewItem;
+            }
         }
 
         private void TabStrip_TabDragStarting(TabView sender, TabViewTabDragStartingEventArgs args)
@@ -298,7 +299,8 @@ private void TabStrip_TabStripDragOver(object sender, DragEventArgs e)
                 e.DragUIOverride.Caption = ResourceController.GetTranslation("TabStripDragAndDropUIOverrideCaption");
                 e.DragUIOverride.IsCaptionVisible = true;
                 e.DragUIOverride.IsGlyphVisible = false;
-            } else
+            }
+            else
             {
                 HorizontalTabView.CanReorderTabs = false;
             }

Files/UserControls/MultitaskingControl/VerticalTabViewControl.xaml.cs

@@ -22,16 +22,15 @@ namespace Files.UserControls
     public sealed partial class VerticalTabViewControl : UserControl, IMultitaskingControl
     {
         private const string TabDropHandledIdentifier = "FilesTabViewItemDropHandled";
+        private readonly DispatcherTimer tabHoverTimer = new DispatcherTimer();
+        private TabViewItem hoveredTabViewItem = null;
 
         public const string TabPathIdentifier = "FilesTabViewItemPath";
 
         public void SelectionChanged() => TabStrip_SelectionChanged(null, null);
 
         public ObservableCollection<TabItem> Items => MainPage.AppInstances;
 
-        private readonly DispatcherTimer tabHoverTimer = new DispatcherTimer();
-        private TabViewItem hoveredTabViewItem = null;
-
         public VerticalTabViewControl()
         {
             this.InitializeComponent();
@@ -215,7 +214,7 @@ private void VerticalTabView_TabItemsChanged(TabView sender, Windows.Foundation.
                     break;
 
                 case Windows.Foundation.Collections.CollectionChange.ItemInserted:
-                    App.InteractionViewModel.TabStripSelectedIndex = Items.IndexOf(VerticalTabView.SelectedItem as TabItem);
+                    App.InteractionViewModel.TabStripSelectedIndex = (int)args.Index;
                     break;
             }
         }
@@ -269,7 +268,9 @@ private void TabHoverSelected(object sender, object e)
         {
             tabHoverTimer.Stop();
             if (hoveredTabViewItem != null)
+            {
                 VerticalTabView.SelectedItem = hoveredTabViewItem;
+            }
         }
 
         private void TabStrip_TabDragStarting(TabView sender, TabViewTabDragStartingEventArgs args)
@@ -288,7 +289,8 @@ private void TabStrip_TabStripDragOver(object sender, DragEventArgs e)
                 e.DragUIOverride.Caption = ResourceController.GetTranslation("TabStripDragAndDropUIOverrideCaption");
                 e.DragUIOverride.IsCaptionVisible = true;
                 e.DragUIOverride.IsGlyphVisible = false;
-            } else
+            }
+            else
             {
                 VerticalTabView.CanReorderTabs = false;
             }