Merge original branch by UnityCoder into geo-at-github fork.

geo-at-github · geo-at-github · commit ee15620909d1 · 2018-01-27T11:50:33.000+01:00
diff --git a/UnityLauncher/Form1.Designer.cs b/UnityLauncher/Form1.Designer.cs
diff --git a/UnityLauncher/Form1.cs b/UnityLauncher/Form1.cs
@@ -767,23 +767,24 @@ private void unityGridView_KeyDown(object sender, KeyEventArgs e)
         /// <param name="e"></param>
         private void Form1_KeyPress(object sender, KeyPressEventArgs e)
         {
-            switch (e.KeyChar)
+            //Console.WriteLine((int)e.KeyChar);
+            switch ((int)e.KeyChar)
             {
-                case '1':
-                    tabControl1.SelectedIndex = 0;
-                    break;
-                case '2':
-                    tabControl1.SelectedIndex = 1;
-                    break;
-                case '3':
-                    tabControl1.SelectedIndex = 2;
-                    break;
-                case '4':
-                    tabControl1.SelectedIndex = 3;
+                case 27: // ESC - clear search
+                    if (tabControl1.SelectedIndex == 0 && tbSearchBar.Text != "")
+                    {
+                        tbSearchBar.Text = "";
+                    }
                     break;
-                default:
-                    if (!tbSearchBar.Focused)
+                default: // any key
+                    // activate searchbar if not active and we are in tab#1
+                    if (tabControl1.SelectedIndex == 0 && tbSearchBar.Focused == false)
                     {
+                        // skip tab key on search field
+                        if ((int)e.KeyChar == 9)
+                        {
+                            break;
+                        }
                         tbSearchBar.Focus();
                         tbSearchBar.Text += e.KeyChar;
                         tbSearchBar.Select(tbSearchBar.Text.Length, 0);
@@ -792,6 +793,8 @@ private void Form1_KeyPress(object sender, KeyPressEventArgs e)
             }
         }
 
+
+
         /// <summary>
         /// grid keys
         /// </summary>
@@ -1069,6 +1072,6 @@ void DisplayUpgradeDialog(string currentVersion, string projectPath, bool launch
             upgradeDialog.Close();
         }
 
-
+     
     }
 }
diff --git a/UnityLauncher/Form1.resx b/UnityLauncher/Form1.resx
@@ -1033,6 +1033,9 @@
   <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>374, 17</value>
   </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>37</value>
+  </metadata>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAABAA0AICAQAAEABADoAgAA1gAAABAQEAABAAQAKAEAAL4DAAAwMAAAAQAIAKgOAADmBAAAICAAAAEA
