improve setting selected row on recent projects (fixed selected row from minimized, keep selected row on clear search)

Author: unitycoder

UnityLauncherPro/MainWindow.xaml

@@ -6,7 +6,7 @@
         xmlns:local="clr-namespace:UnityLauncherPro"
 		xmlns:System="clr-namespace:System;assembly=mscorlib" x:Class="UnityLauncherPro.MainWindow"
 		mc:Ignorable="d"
-        Title="UnityLauncherPro" Height="650" Width="600" WindowStartupLocation="CenterScreen" Background="{DynamicResource DarkestBackground}" MinWidth="600" MinHeight="650" AllowsTransparency="True" WindowStyle="None" Margin="0" KeyDown="OnWindowKeyDown" Closing="Window_Closing" SizeChanged="Window_SizeChanged" Icon="Images/icon.ico"	>
+        Title="UnityLauncherPro" Height="650" Width="600" WindowStartupLocation="CenterScreen" Background="{DynamicResource DarkestBackground}" MinWidth="600" MinHeight="650" AllowsTransparency="True" WindowStyle="None" Margin="0" KeyDown="OnWindowKeyDown" Closing="Window_Closing" SizeChanged="Window_SizeChanged" Icon="Images/icon.ico" Activated="Window_Activated"	>
 
 	<Window.Resources>
 

UnityLauncherPro/MainWindow.xaml.cs

@@ -385,48 +385,14 @@ void RefreshRecentProjects()
         //
         //
 
-
-        //private void OnSearchPreviewKeyDown(object sender, KeyEventArgs e)
-        //{
-        //    switch (e.Key)
-        //    {
-        //        case Key.Escape:
-        //            if (((TextBox)sender).Text == "")
-        //            {
-        //                Console.WriteLine(1);
-        //                Keyboard.Focus(gridRecent);
-        //                e.Handled = true;
-        //            }
-        //            ((TextBox)sender).Text = "";
-        //            break;
-        //        default:
-        //            break;
-        //    }
-        //}
-
+        // maximize window
         void NotifyIcon_MouseClick(object sender, System.Windows.Forms.MouseEventArgs e)
         {
             this.Show();
             this.WindowState = WindowState.Normal;
             notifyIcon.Visible = false;
-        }
-
-        // hide/show notifyicon based on window state
-        private void Window_StateChanged(object sender, EventArgs e)
-        {
-            if (this.WindowState == WindowState.Minimized)
-            {
-                this.ShowInTaskbar = false;
-                notifyIcon.BalloonTipTitle = "Minimize Sucessful";
-                notifyIcon.BalloonTipText = "Minimized the app ";
-                notifyIcon.ShowBalloonTip(400);
-                notifyIcon.Visible = true;
-            }
-            else if (this.WindowState == WindowState.Normal)
-            {
-                notifyIcon.Visible = false;
-                this.ShowInTaskbar = true;
-            }
+            // NOTE workaround for grid not focused when coming back from minimized window
+            Tools.SetFocusToGrid(gridRecent, GetSelectedProjectIndex());
         }
 
         private void OnRectangleMouseDown(object sender, MouseButtonEventArgs e)
@@ -512,9 +478,14 @@ private void OnWindowKeyDown(object sender, KeyEventArgs e)
                         case Key.Escape: // clear project search
                             if (txtSearchBox.Text == "")
                             {
-                                if (txtSearchBox.IsFocused) Tools.SetFocusToGrid(gridRecent);
+                                // its already clear
                             }
-                            txtSearchBox.Text = "";
+                            else // we have text in searchbox
+                            {
+                                txtSearchBox.Text = "";
+                            }
+                            // try to keep selected row selected and in view
+                            Tools.SetFocusToGrid(gridRecent);
                             break;
                         case Key.F5:
                             txtSearchBox.Text = "";
@@ -523,6 +494,7 @@ private void OnWindowKeyDown(object sender, KeyEventArgs e)
                         case Key.Left:
                         case Key.Right:
                         case Key.Down:
+                            break;
                         case Key.F2: // edit arguments
                             break;
                         default: // any key
@@ -757,8 +729,8 @@ private void TxtSearchBox_PreviewKeyDown(object sender, KeyEventArgs e)
                     //}
                     //else
                     //{
-                        Tools.SetFocusToGrid(gridRecent);
-//                    }
+                    Tools.SetFocusToGrid(gridRecent);
+                    //                    }
                     e.Handled = true; // to stay in first row
                     break;
                 default:
@@ -795,15 +767,11 @@ private void BtnRemoveInstallationFolder_Click(object sender, RoutedEventArgs e)
             }
         }
 
-        // need to manually move into next/prev rows? https://stackoverflow.com/a/11652175/5452781
+        // need to manually move into next/prev rows? Not using https://stackoverflow.com/a/11652175/5452781
         private void GridRecent_PreviewKeyDown(object sender, KeyEventArgs e)
         {
             switch (e.Key)
             {
-                case Key.Up:
-                case Key.Down:
-                    break;
-
                 case Key.F5: // refresh projects
                     RefreshRecentProjects();
                     break;
@@ -1153,5 +1121,11 @@ private void MenuItemSetPreferredUnityVersion_Click(object sender, RoutedEventAr
             UpdateUnityInstallationsList();
 
         }
+
+        private void Window_Activated(object sender, EventArgs e)
+        {
+            //Console.WriteLine("gridRecent.IsFocused=" + gridRecent.IsFocused);
+            //Console.WriteLine("gridRecent.IsFocused=" + gridRecent.IsKeyboardFocused);
+        }
     } // class
 } //namespace

UnityLauncherPro/Tools.cs

@@ -665,20 +665,37 @@ public static string ReadCustomLaunchArguments(string projectPath, string launch
 
         public static void SetFocusToGrid(DataGrid targetGrid, int index = -1)
         {
+            // set main component focus
+            //targetGrid.Focus();
+            //Keyboard.Focus(targetGrid);
+
+            // no items
             if (targetGrid.Items.Count < 1) return;
-            if (index == -1 && targetGrid.SelectedIndex > -1) index = targetGrid.SelectedIndex; // keep current row selected
+
+            // keep current row selected
+            if (index == -1 && targetGrid.SelectedIndex > -1) index = targetGrid.SelectedIndex;
+
+            // if no item selected, pick first
             if (index == -1) index = 0;
 
-            targetGrid.Focus();
+            targetGrid.SelectedIndex = index;
+
+            // set full focus
             DataGridRow row = (DataGridRow)targetGrid.ItemContainerGenerator.ContainerFromIndex(index);
             if (row == null)
             {
                 targetGrid.UpdateLayout();
+                // scroll to view if outside
                 targetGrid.ScrollIntoView(targetGrid.Items[index]);
                 row = (DataGridRow)targetGrid.ItemContainerGenerator.ContainerFromIndex(index);
             }
-            row.MoveFocus(new TraversalRequest(FocusNavigationDirection.Next));
-            targetGrid.SelectedIndex = 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);
+
         }
 
     } // class