Bepis 6 лет назад
Родитель
Сommit
9692fa573e
3 измененных файлов с 11 добавлено и 3 удалено
  1. 4 2
      NTERA/formMain.Designer.cs
  2. 4 1
      NTERA/formMain.cs
  3. 3 0
      NTERA/formMain.resx

+ 4 - 2
NTERA/formMain.Designer.cs

@@ -30,8 +30,9 @@ namespace NTERA
 		/// </summary>
 		private void InitializeComponent()
 		{
-			this.consoleControl1 = new ConsoleControl();
+			this.consoleControl1 = new NTERA.Console.ConsoleControl();
 			this.txtInput = new System.Windows.Forms.TextBox();
+			this.backgroundWorker1 = new System.ComponentModel.BackgroundWorker();
 			this.SuspendLayout();
 			// 
 			// consoleControl1
@@ -50,7 +51,7 @@ namespace NTERA
 			this.txtInput.Name = "txtInput";
 			this.txtInput.Size = new System.Drawing.Size(1184, 20);
 			this.txtInput.TabIndex = 1;
-			this.txtInput.KeyUp += new System.Windows.Forms.KeyEventHandler(this.txtInput_KeyUp);
+			this.txtInput.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtInput_KeyDown);
 			// 
 			// formMain
 			// 
@@ -72,6 +73,7 @@ namespace NTERA
 
 		private ConsoleControl consoleControl1;
 		private System.Windows.Forms.TextBox txtInput;
+		private System.ComponentModel.BackgroundWorker backgroundWorker1;
 	}
 }
 

+ 4 - 1
NTERA/formMain.cs

@@ -21,12 +21,15 @@ namespace NTERA
 			Task.Factory.StartNew(() => instance.Run(new EraConsoleInstance(consoleControl1.Renderer), new EmuEraGameInstance()));
 		}
 
-		private void txtInput_KeyUp(object sender, KeyEventArgs e)
+		private void txtInput_KeyDown(object sender, KeyEventArgs e)
 		{
 			if (e.KeyCode == Keys.Enter)
 			{
 				instance.GiveInput(txtInput.Text);
 				txtInput.Text = "";
+
+				e.Handled = true;
+				e.SuppressKeyPress = true;
 			}
 		}
 	}

+ 3 - 0
NTERA/formMain.resx

@@ -117,4 +117,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="backgroundWorker1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
 </root>