Always select first column on F2 (#2817)

Author: gave92

Files/BaseLayout.cs

@@ -91,7 +91,7 @@ internal set
                 if (value != selectedItems)
                 {
                     selectedItems = value;
-                    if (selectedItems.Count == 0)
+                    if (selectedItems.Count == 0 || selectedItems[0] == null)
                     {
                         IsItemSelected = false;
                         SelectedItem = null;

Files/Views/LayoutModes/GenericFileBrowser.xaml.cs

@@ -176,8 +176,11 @@ public override void FocusSelectedItems()
 
         public override void StartRenameItem()
         {
-            AllView.CurrentColumn = AllView.Columns[1];
-            AllView.BeginEdit();
+            if (AllView.SelectedIndex != -1)
+            {
+                AllView.CurrentColumn = AllView.Columns[1];
+                AllView.BeginEdit();
+            }
         }
 
         private void ViewModel_PropertyChanged(object sender, PropertyChangedEventArgs e)

Files/Views/ModernShellPage.xaml.cs

@@ -1115,17 +1115,17 @@ await FilesystemHelpers.DeleteItemsAsync(
                     break;
             };
 
-            if (CurrentPageType == typeof(GridViewBrowser))
+            switch (args.KeyboardAccelerator.Key)
             {
-                switch (args.KeyboardAccelerator.Key)
-                {
-                    case VirtualKey.F2: //F2, rename
+                case VirtualKey.F2: //F2, rename
+                    if (CurrentPageType == typeof(GenericFileBrowser) || CurrentPageType == typeof(GridViewBrowser))
+                    {
                         if (ContentPage.IsItemSelected)
                         {
                             InteractionOperations.RenameItem_Click(null, null);
                         }
-                        break;
-                }
+                    }
+                    break;
             }
         }