Changeset 18176 for branches/3136_Structural_GP/HeuristicLab.Data.Views/3.3/StringConvertibleMatrixView.cs

Timestamp:

01/03/22 12:23:11 (2 years ago)

Author:

gkronber

Message:

#3136: merged r18165:18174 from trunk to branch (resolving conflicts in the parser)

Location:

branches/3136_Structural_GP

Files:

• . (modified) (1 prop)
• HeuristicLab.Data.Views (modified) (1 prop)
• HeuristicLab.Data.Views/3.3 (modified) (1 prop)
• HeuristicLab.Data.Views/3.3/StringConvertibleMatrixView.cs (modified) (2 diffs)

branches/3136_Structural_GP/HeuristicLab.Data.Views/3.3/StringConvertibleMatrixView.cs

@@ -227 +227 @@
     }
     private void rowsTextBox_KeyDown(object sender, KeyEventArgs e) {
-      if (e.KeyCode == Keys.Enter || e.KeyCode == Keys.Return)
+      if (e.KeyCode == Keys.Enter || e.KeyCode == Keys.Return) {
         rowsLabel.Focus();  // set focus on label to validate data
-      if (e.KeyCode == Keys.Escape) {
+        e.SuppressKeyPress = true;
+      } else if (e.KeyCode == Keys.Escape) {
         rowsTextBox.Text = Content.Rows.ToString();
         rowsLabel.Focus();  // set focus on label to validate data
+        e.SuppressKeyPress = true;
       }
     }
@@ -249 +251 @@
     }
     private void columnsTextBox_KeyDown(object sender, KeyEventArgs e) {
-      if (e.KeyCode == Keys.Enter || e.KeyCode == Keys.Return)
+      if (e.KeyCode == Keys.Enter || e.KeyCode == Keys.Return) {
         columnsLabel.Focus();  // set focus on label to validate data
-      if (e.KeyCode == Keys.Escape) {
+        e.SuppressKeyPress = true;
+      } else if (e.KeyCode == Keys.Escape) {
         columnsTextBox.Text = Content.Columns.ToString();
         columnsLabel.Focus();  // set focus on label to validate data
+        e.SuppressKeyPress = true;
       }
     }