Merge pull request #9 from DHancock/current

Fix layout bug
DHancock · Oct 25, 2019 · 28d27cd · 28d27cd
2 parents 84ae303 + 9fa16dd
commit 28d27cd
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 21 deletions.
diff --git a/FieldChooser.version b/FieldChooser.version
@@ -1,3 +1,3 @@
 :
-FieldChooser:1.1
+FieldChooser:1.1.1
 :
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -33,7 +33,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1")]
-[assembly: AssemblyFileVersion("1.1")]
+[assembly: AssemblyVersion("1.1.1")]
+[assembly: AssemblyFileVersion("1.1.1")]
 [assembly: NeutralResourcesLanguage("en")]
 
diff --git a/Source/FieldChooserForm.Designer.cs b/Source/FieldChooserForm.Designer.cs
diff --git a/Source/FieldChooserForm.cs b/Source/FieldChooserForm.cs
@@ -215,7 +215,7 @@ private bool LoadCharacterTextBox(int selectedIndex, TextBox textBox)
         [SecurityPermission(SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.UnmanagedCode)]
         protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
         {
-            if (keyData == Keys.Escape)
+            if ((keyData == Keys.Escape) || (keyData == Keys.Enter))
             {
                 Close();
                 return true;