updates for 1.3.0i and fix alt-tab behaviour of ctrl-p panel

factubsio · Apr 22, 2022 · f48cdf0 · f48cdf0
1 parent 429e421
commit f48cdf0
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 1 deletion.
diff --git a/BlueprintExplorer/BlueprintDB.cs b/BlueprintExplorer/BlueprintDB.cs
@@ -123,7 +123,7 @@ public int CompareTo(GameVersion other)
 
         public List<GameVersion> Available = new() { };
 
-        private readonly GameVersion LastKnown = new(1, 2, 0, 'A', 2);
+        private readonly GameVersion LastKnown = new(1, 3, 0, 'i', 0);
 
         private readonly string filenameRoot = "blueprints_raw";
         private readonly string extension = "binz";

diff --git a/BlueprintExplorer/CtrlP.cs b/BlueprintExplorer/CtrlP.cs
@@ -103,9 +103,21 @@ public CtrlP()
             rootHost.HostedControls.Add("none", noResults);
             rootHost.ShowControl("none");
 
+            this.ShowInTaskbar = false;
+
             DoubleBuffered = true;
         }
 
+        protected override CreateParams CreateParams
+        {
+            get
+            {
+                var defaultParams = base.CreateParams;
+                defaultParams.ExStyle |= 0x80;
+                return defaultParams;
+            }
+        }
+
         private void Root_MouseClick(object sender, MouseEventArgs e)
         {
             if (e.Button == MouseButtons.Middle || e.Button == MouseButtons.Left)
@@ -235,6 +247,7 @@ protected override void OnDeactivate(EventArgs e)
 
         protected override void OnActivated(EventArgs e)
         {
+            Owner = Daddy;
             UpdateSize();
             if (savedVerticalScroll != -1)
             {

diff --git a/BlueprintExplorer/Form1.Designer.cs b/BlueprintExplorer/Form1.Designer.cs
diff --git a/BlueprintExplorer/Form1.cs b/BlueprintExplorer/Form1.cs
@@ -575,17 +575,27 @@ public void HandleGlobalKeys(object sender, KeyEventArgs e)
                     if (e.KeyCode == Keys.Escape)
                     {
                         input.FindForm().ActiveControl = null;
+                        e.SuppressKeyPress = true;
+                        e.Handled = true;
                     }
                     return;
                 }
 
                 if (ActiveViewer?.Searching == true)
                 {
                     if (e.KeyCode == Keys.Escape)
+                    {
                         ActiveViewer.StopSearching(false);
+                        e.SuppressKeyPress = true;
+                        e.Handled = true;
+                    }
 
                     if (e.KeyCode == Keys.Enter || e.KeyCode == Keys.Return)
+                    {
                         ActiveViewer.StopSearching(true);
+                        e.SuppressKeyPress = true;
+                        e.Handled = true;
+                    }
 
                     return;
                 }