From 52dbff16068dda00bb12fe28316ca2497c404cde Mon Sep 17 00:00:00 2001 From: "andres.delikat" Date: Sun, 20 Mar 2011 01:25:11 +0000 Subject: [PATCH] Better input validation on Ram Watch - New Watch Dialog --- BizHawk.MultiClient/tools/RamWatch.cs | 1 - BizHawk.MultiClient/tools/RamWatchNewWatch.Designer.cs | 1 + BizHawk.MultiClient/tools/RamWatchNewWatch.cs | 9 ++++++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/BizHawk.MultiClient/tools/RamWatch.cs b/BizHawk.MultiClient/tools/RamWatch.cs index 2ed1fd175d..8f5e76eacb 100644 --- a/BizHawk.MultiClient/tools/RamWatch.cs +++ b/BizHawk.MultiClient/tools/RamWatch.cs @@ -17,7 +17,6 @@ namespace BizHawk.MultiClient public partial class RamWatch : Form { //TODO: - //address num digits based on domain size //Restore window size should restore column order as well //When receiving a watch from a different domain, should something be done? diff --git a/BizHawk.MultiClient/tools/RamWatchNewWatch.Designer.cs b/BizHawk.MultiClient/tools/RamWatchNewWatch.Designer.cs index b810e16115..a21d868653 100644 --- a/BizHawk.MultiClient/tools/RamWatchNewWatch.Designer.cs +++ b/BizHawk.MultiClient/tools/RamWatchNewWatch.Designer.cs @@ -79,6 +79,7 @@ this.AddressBox.TabIndex = 2; this.AddressBox.Text = "00000000"; this.AddressBox.Leave += new System.EventHandler(this.AddressBox_Leave); + this.AddressBox.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.AddressBox_KeyPress); // // NotesBox // diff --git a/BizHawk.MultiClient/tools/RamWatchNewWatch.cs b/BizHawk.MultiClient/tools/RamWatchNewWatch.cs index 1172be743e..24db3a035a 100644 --- a/BizHawk.MultiClient/tools/RamWatchNewWatch.cs +++ b/BizHawk.MultiClient/tools/RamWatchNewWatch.cs @@ -12,7 +12,6 @@ namespace BizHawk.MultiClient { public partial class RamWatchNewWatch : Form { - //TODO: better input validation - Like Ram Search public Watch watch = new Watch(); public bool userSelected = false; public bool customSetup = false; @@ -152,5 +151,13 @@ namespace BizHawk.MultiClient t.Show("MUst be a valid hexadecimal vaue", AddressBox, 5000); } } + + private void AddressBox_KeyPress(object sender, KeyPressEventArgs e) + { + if (e.KeyChar == '\b') return; + + if (!InputValidate.IsValidHexNumber(e.KeyChar)) + e.Handled = true; + } } }