recent projects: fix context menu crash, fix removing last items from grid list (by making right mouse button also select the row,) fixes #223

unitycoder · unitycoder · commit d2da9474b9c6 · 2026-04-18T23:56:32.000+03:00
diff --git a/UnityLauncherPro/MainWindow.xaml b/UnityLauncherPro/MainWindow.xaml
@@ -56,7 +56,7 @@
                     <Button Style="{StaticResource CustomButton}" ToolTip="Browse and add existing project to list" x:Name="btnAddProjectFolder" Content="Add Project.." Height="22" Width="78" HorizontalAlignment="Right" VerticalAlignment="Top"  Margin="0,4,38,0" Click="BtnAddProjectFolder_Click" TabIndex="10" Grid.Column="1" />
                     <Button Style="{StaticResource CustomButton}" ToolTip="Refresh list (F5)" x:Name="btnRefreshProjectList" Content="⟳" Height="22" Width="26" HorizontalAlignment="Right" VerticalAlignment="Top" FontSize="16"  Margin="0,4,3,0" Padding="1,-2,1,1" Click="BtnRefreshProjectList_Click" TabIndex="11" Grid.Column="1"/>
 
-                    <DataGrid x:Name="gridRecent" HorizontalContentAlignment="Left" VerticalContentAlignment="Top" SelectionMode="Single" Margin="4,30,2,42" CanUserAddRows="False" Background="{x:Null}" BorderBrush="{x:Null}" ColumnHeaderStyle="{StaticResource HeaderStyle}" Padding="0" HorizontalScrollBarVisibility="Disabled" HeadersVisibility="Column" Foreground="{DynamicResource ThemeGridForeground}" HorizontalGridLinesBrush="{DynamicResource ThemeDatagridLines}" VerticalGridLinesBrush="{DynamicResource ThemeGridVerticalGridLines}" AutoGenerateColumns="False" PreviewKeyDown="GridRecent_PreviewKeyDown" Loaded="GridRecent_Loaded" TabIndex="2" CellEditEnding="GridRecent_CellEditEnding" PreviewMouseDoubleClick="GridRecent_PreviewMouseDoubleClick" ContextMenuOpening="GridRecent_ContextMenuOpening" BeginningEdit="GridRecent_BeginningEdit" RowHeight="21" ColumnReordered="GridRecent_ColumnReordered" Sorting="gridRecent_Sorting" Grid.ColumnSpan="2" DragLeave="gridRecent_DragLeave" DragEnter="gridRecent_DragEnter" Drop="gridRecent_Drop" AllowDrop="True" >
+                    <DataGrid x:Name="gridRecent" HorizontalContentAlignment="Left" VerticalContentAlignment="Top" SelectionMode="Single" Margin="4,30,2,42" CanUserAddRows="False" Background="{x:Null}" BorderBrush="{x:Null}" ColumnHeaderStyle="{StaticResource HeaderStyle}" Padding="0" HorizontalScrollBarVisibility="Disabled" HeadersVisibility="Column" Foreground="{DynamicResource ThemeGridForeground}" HorizontalGridLinesBrush="{DynamicResource ThemeDatagridLines}" VerticalGridLinesBrush="{DynamicResource ThemeGridVerticalGridLines}" AutoGenerateColumns="False" PreviewKeyDown="GridRecent_PreviewKeyDown" Loaded="GridRecent_Loaded" TabIndex="2" CellEditEnding="GridRecent_CellEditEnding" PreviewMouseDoubleClick="GridRecent_PreviewMouseDoubleClick" ContextMenuOpening="GridRecent_ContextMenuOpening" BeginningEdit="GridRecent_BeginningEdit" RowHeight="21" ColumnReordered="GridRecent_ColumnReordered" Sorting="gridRecent_Sorting" Grid.ColumnSpan="2" DragLeave="gridRecent_DragLeave" DragEnter="gridRecent_DragEnter" Drop="gridRecent_Drop" AllowDrop="True" PreviewMouseRightButtonDown="gridRecent_PreviewMouseRightButtonDown" >
 
                         <DataGrid.CommandBindings>
                             <CommandBinding Command="ApplicationCommands.Copy" Executed="CopyRowFolderToClipBoard" CanExecute="CanExecute_Copy"/>
diff --git a/UnityLauncherPro/MainWindow.xaml.cs b/UnityLauncherPro/MainWindow.xaml.cs
@@ -1268,7 +1268,7 @@ private void RemoveProjectFromList(bool confirm = false)
                 projectsSource.Remove(proj);
                 gridRecent.Items.Refresh();
                 Tools.SetFocusToGrid(gridRecent);
-                gridRecent.SelectedIndex = 0;
+                if (gridRecent.Items.Count > 0) gridRecent.SelectedIndex = 0;
             }
 
             // NOTE this doesnt remove from settings list?
@@ -2332,8 +2332,15 @@ private void GridRecent_ContextMenuOpening(object sender, ContextMenuEventArgs e
             if (tabControl.SelectedIndex == 0)
             {
                 var proj = GetSelectedProject();
-                var proc = ProcessHandler.Get(proj.Path);
-                menuItemKillProcess.IsEnabled = proc != null;
+                if (proj != null)
+                {
+                    var proc = ProcessHandler.Get(proj.Path);
+                    menuItemKillProcess.IsEnabled = proc != null;
+                }
+                else
+                {
+                    menuItemKillProcess.IsEnabled = false;
+                }
             }
         }
 
@@ -3161,6 +3168,8 @@ private void BtnThemeEditor_Click(object sender, RoutedEventArgs e)
 
         private void MenuRemoveProject_Click(object sender, RoutedEventArgs e)
         {
+            var proj = GetSelectedProject();
+            if (proj == null) return;
             RemoveProjectFromList();
         }
 
@@ -4324,6 +4333,24 @@ private void gridRecent_Drop(object sender, DragEventArgs e)
             }
         }
 
+        private void gridRecent_PreviewMouseRightButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            var dep = e.OriginalSource as DependencyObject;
+            if (dep == null) return;
+
+            while (dep != null && !(dep is DataGridRow))
+            {
+                dep = VisualTreeHelper.GetParent(dep);
+            }
+
+            var row = dep as DataGridRow;
+            if (row == null) return;
+
+            gridRecent.SelectedItem = row.Item;
+            gridRecent.SelectedIndex = row.GetIndex();
+            row.Focus();
+        }
+
         //private void menuProjectProperties_Click(object sender, RoutedEventArgs e)
         //{
         //    var proj = GetSelectedProject();
