fix(tabs): Improve the tab closing

Author: Pinguin2001

src/WindowChrome.xaml.cs

@@ -52,18 +52,27 @@ private void TabListView_SelectionChanged(object sender, SelectionChangedEventAr
     }
 
     private void CloseTabButton_Click(object sender, RoutedEventArgs e)
+    {
+        var button = (Button)sender;
+        var tab = (Tab)button.DataContext;
+        CloseTab(tab);
+    }
+
+    private void CloseTab(Tab tab)
     {
         if (MainViewModel.MainVM.Tabs.Count > 1)
         {
-            var button = (Button)sender;
-            var tab = (Tab)button.DataContext;
             int index = MainViewModel.MainVM.Tabs.IndexOf(tab);
             tab.WebContentInstance.WebContentControl.Close();
             tab.WebContentInstance = null;
             if (index == 0)
+            {
                 TabListView.SelectedIndex = 1;
+            }
             else
-                TabListView.SelectedIndex = MainViewModel.MainVM.Tabs.Count - 2;
+            {
+                TabListView.SelectedIndex = index - 1;
+            }
             MainViewModel.MainVM.Tabs.Remove(tab);
         }
         else
@@ -72,6 +81,7 @@ private void CloseTabButton_Click(object sender, RoutedEventArgs e)
         }
     }
 
+
     private Tab _selectedTab;
 
     public Tab SelectedTab
@@ -144,26 +154,10 @@ private void Grid_PointerPressed(object sender, PointerRoutedEventArgs e)
         var pointer = e.GetCurrentPoint(sender as Grid);
         if (pointer.Properties.IsMiddleButtonPressed)
         {
-            if (MainViewModel.MainVM.Tabs.Count > 1)
-            {
-                var button = (Grid)sender;
-                var tab = (Tab)button.DataContext;
-                int index = MainViewModel.MainVM.Tabs.IndexOf(tab);
-                tab.WebContentInstance.WebContentControl.Close();
-                tab.WebContentInstance = null;
-                if (index == 0)
-                    TabListView.SelectedIndex = 1;
-                else
-                    TabListView.SelectedIndex = MainViewModel.MainVM.Tabs.Count - 2;
-                MainViewModel.MainVM.Tabs.Remove(tab);
-            }
-            else
-            {
-                WindowHelper.CloseMainWindow();
-            }
+            var button = (Grid)sender;
+            var tab = (Tab)button.DataContext;
+            CloseTab(tab);
         }
-
-
     }
 
     Tab CTXSelectedTab;