Fix crash if navigation is triggered while renaming (#7481)

* Check for null parent when setting ColumnSpan

* Fix wrong merge

Author: gave92

src/Files/Views/LayoutModes/ColumnViewBase.xaml.cs

@@ -375,14 +375,6 @@ private async void FileList_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
                 // Unfocus the GridView so keyboard shortcut can be handled
                 NavToolbar?.Focus(FocusState.Pointer);
             }
-            else if (ctrlPressed && shiftPressed && (e.Key == VirtualKey.Left || e.Key == VirtualKey.Right || e.Key == VirtualKey.W))
-            {
-                if (!IsRenamingItem)
-                {
-                    // Unfocus the ListView so keyboard shortcut can be handled (ctrl + shift + W/"->"/"<-")
-                    NavToolbar?.Focus(FocusState.Pointer);
-                }
-            }
             else if (e.KeyStatus.IsMenuKeyDown && shiftPressed && e.Key == VirtualKey.Add)
             {
                 // Unfocus the ListView so keyboard shortcut can be handled (alt + shift + "+")

src/Files/Views/LayoutModes/DetailsLayoutBrowser.xaml.cs

@@ -416,12 +416,13 @@ private async void CommitRename(TextBox textBox)
 
         private void EndRename(TextBox textBox)
         {
-            if (textBox != null)
+            if (textBox != null && textBox.FindParent<Grid>() is FrameworkElement parent)
             {
-                Grid.SetColumnSpan(textBox.FindParent<Grid>(), 1);
+                Grid.SetColumnSpan(parent, 1);
             }
 
             ListViewItem listViewItem = FileList.ContainerFromItem(RenamingItem) as ListViewItem;
+
             if (textBox == null || listViewItem == null)
             {
                 // Navigating away, do nothing
@@ -476,14 +477,6 @@ private async void FileList_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
                 // Unfocus the GridView so keyboard shortcut can be handled
                 NavToolbar?.Focus(FocusState.Pointer);
             }
-            else if (ctrlPressed && shiftPressed && (e.Key == VirtualKey.Left || e.Key == VirtualKey.Right || e.Key == VirtualKey.W))
-            {
-                if (!IsRenamingItem)
-                {
-                    // Unfocus the ListView so keyboard shortcut can be handled (ctrl + shift + W/"->"/"<-")
-                    NavToolbar?.Focus(FocusState.Pointer);
-                }
-            }
             else if (e.KeyStatus.IsMenuKeyDown && shiftPressed && e.Key == VirtualKey.Add)
             {
                 // Unfocus the ListView so keyboard shortcut can be handled (alt + shift + "+")

src/Files/Views/LayoutModes/GridViewBrowser.xaml.cs

@@ -397,14 +397,6 @@ private async void FileList_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
                 // Unfocus the GridView so keyboard shortcut can be handled
                 NavToolbar?.Focus(FocusState.Pointer);
             }
-            else if (ctrlPressed && shiftPressed && (e.Key == VirtualKey.Left || e.Key == VirtualKey.Right || e.Key == VirtualKey.W))
-            {
-                if (!IsRenamingItem)
-                {
-                    // Unfocus the ListView so keyboard shortcut can be handled (ctrl + shift + W/"->"/"<-")
-                    NavToolbar?.Focus(FocusState.Pointer);
-                }
-            }
             else if (e.KeyStatus.IsMenuKeyDown && shiftPressed && e.Key == VirtualKey.Add)
             {
                 // Unfocus the ListView so keyboard shortcut can be handled (alt + shift + "+")