Projects: Fix adding existing project and creating new project (select correct just added row, fix red path color, fix null ref if refresh) fixes #125

Author: unitycoder

UnityLauncherPro/MainWindow.xaml.cs

@@ -731,7 +731,7 @@ public void RefreshRecentProjects()
             // take currently selected project row
             lastSelectedProjectIndex = gridRecent.SelectedIndex;
             // rescan recent projects
-            projectsSource = GetProjects.Scan(getGitBranch: (bool)chkShowGitBranchColumn.IsChecked, getPlasticBranch: (bool)chkCheckPlasticBranch.IsChecked, getArguments: (bool)chkShowLauncherArgumentsColumn.IsChecked, showMissingFolders: (bool)chkShowMissingFolderProjects.IsChecked, showTargetPlatform: (bool)chkShowPlatform.IsChecked, AllProjectPaths: Properties.Settings.Default.projectPaths);
+            projectsSource = GetProjects.Scan(getGitBranch: (bool)chkShowGitBranchColumn.IsChecked, getPlasticBranch: (bool)chkCheckPlasticBranch.IsChecked, getArguments: (bool)chkShowLauncherArgumentsColumn.IsChecked, showMissingFolders: (bool)chkShowMissingFolderProjects.IsChecked, showTargetPlatform: (bool)chkShowPlatform.IsChecked, AllProjectPaths: Settings.Default.projectPaths);
             gridRecent.ItemsSource = projectsSource;
 
             // fix sorting on refresh
@@ -787,9 +787,13 @@ private void BtnAddProjectFolder_Click(object sender, RoutedEventArgs e)
             if (string.IsNullOrEmpty(folder) == false)
             {
                 var proj = GetNewProjectData(folder);
-                AddNewProjectToList(proj);
+                //AddNewProjectToList(proj);
+                Tools.AddProjectToHistory(proj.Path);
                 // clear search, so can see added project
                 txtSearchBox.Text = "";
+                RefreshRecentProjects();
+                // NOTE 0 works for sort-by-date only
+                Tools.SetFocusToGrid(gridRecent, 0);
             }
         }
 
@@ -799,7 +803,7 @@ Project GetNewProjectData(string folder)
             p.Path = folder;
             p.Title = Path.GetFileName(folder);
             p.Version = Tools.GetProjectVersion(folder);
-            p.Arguments = Tools.ReadCustomProjectData(folder, MainWindow.launcherArgumentsFile);
+            p.Arguments = Tools.ReadCustomProjectData(folder, launcherArgumentsFile);
             if ((bool)chkShowPlatform.IsChecked == true) p.TargetPlatform = Tools.GetTargetPlatform(folder);
             if ((bool)chkShowGitBranchColumn.IsChecked == true) p.GITBranch = Tools.ReadGitBranchInfo(folder);
             return p;
@@ -808,9 +812,11 @@ Project GetNewProjectData(string folder)
         void AddNewProjectToList(Project proj)
         {
             projectsSource.Insert(0, proj);
-            gridRecent.Items.Refresh();
-            Tools.SetFocusToGrid(gridRecent); // force focus
             gridRecent.SelectedIndex = 0;
+            Tools.SetFocusToGrid(gridRecent);
+            // force refresh
+            txtSearchBox.Text = proj.Title;
+            txtSearchBox.Text = "";
         }
 
         private void BtnClose_Click(object sender, RoutedEventArgs e)

UnityLauncherPro/Tools.cs

@@ -1167,14 +1167,14 @@ public static bool SaveCustomProjectData(string projectPath, string customFile,
 
         public static bool HasFocus(DependencyObject obj, Control control, bool checkChildren)
         {
-            var oFocused = System.Windows.Input.FocusManager.GetFocusedElement(obj) as DependencyObject;
+            var oFocused = FocusManager.GetFocusedElement(obj) as DependencyObject;
             if (!checkChildren)
                 return oFocused == control;
             while (oFocused != null)
             {
                 if (oFocused == control)
                     return true;
-                oFocused = System.Windows.Media.VisualTreeHelper.GetParent(oFocused);
+                oFocused = VisualTreeHelper.GetParent(oFocused);
             }
             return false;
         }
@@ -1201,23 +1201,32 @@ public static void SetFocusToGrid(DataGrid targetGrid, int index = -1)
             if (row == null)
             {
                 targetGrid.UpdateLayout();
-                // scroll to view if outside
-                targetGrid.ScrollIntoView(targetGrid.Items[index]);
-                row = (DataGridRow)targetGrid.ItemContainerGenerator.ContainerFromIndex(index);
+                if (index < targetGrid.Items.Count)
+                {
+                    // scroll selected into view
+                    targetGrid.ScrollIntoView(targetGrid.Items[index]);
+                    row = (DataGridRow)targetGrid.ItemContainerGenerator.ContainerFromIndex(index);
+                }
+                else
+                {
+                    Console.WriteLine("selected row out of bounds: " + index);
+                }
             }
             // NOTE does this causes move below?
             //row.MoveFocus(new TraversalRequest(FocusNavigationDirection.Next));
-            row.MoveFocus(new TraversalRequest(FocusNavigationDirection.Up)); // works better than Up
-
-            row.Focus();
-            Keyboard.Focus(row);
+            if (row != null)
+            {
+                row.MoveFocus(new TraversalRequest(FocusNavigationDirection.Up)); // works better than Up
+                row.Focus();
+                Keyboard.Focus(row);
+            }
         }
 
         public static string BrowseForOutputFolder(string title, string initialDirectory = null)
         {
             // https://stackoverflow.com/a/50261723/5452781
             // Create a "Save As" dialog for selecting a directory (HACK)
-            var dialog = new Microsoft.Win32.SaveFileDialog();
+            var dialog = new SaveFileDialog();
             if (initialDirectory != null) dialog.InitialDirectory = initialDirectory;
             dialog.Title = title;
             dialog.Filter = "Project Folder|*.Folder"; // Prevents displaying files
@@ -1297,11 +1306,12 @@ public static Project FastCreateProject(string version, string baseFolder, strin
             // launch empty project
             var proj = new Project();
             proj.Title = projectName;
-            proj.Path = Path.Combine(baseFolder, newPath);
+            proj.Path = Path.Combine(baseFolder, newPath).Replace("\\", "/");
             proj.Version = version;
             proj.TargetPlatforms = platformsForThisUnity;
             proj.TargetPlatform = platform;
             proj.Modified = DateTime.Now;
+            proj.folderExists = true; // have to set this value, so item is green on list
 
             var proc = LaunchProject(proj, null, useInitScript);
             ProcessHandler.Add(proj, proc);