From c8a285dee60620290e7156dcc2691b89e70055fa Mon Sep 17 00:00:00 2001 From: KrossX Date: Fri, 2 Aug 2019 00:36:15 -0300 Subject: [PATCH] GSDumpGUI: Now textbox path change requires enter key. --- tools/GSDumpGUI/Forms/frmMain.Designer.cs | 2 ++ tools/GSDumpGUI/Forms/frmMain.cs | 22 +++++++++++++++++++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/tools/GSDumpGUI/Forms/frmMain.Designer.cs b/tools/GSDumpGUI/Forms/frmMain.Designer.cs index f66a1d393f..89bfc3d135 100644 --- a/tools/GSDumpGUI/Forms/frmMain.Designer.cs +++ b/tools/GSDumpGUI/Forms/frmMain.Designer.cs @@ -97,6 +97,7 @@ this.txtGSDXDirectory.TabStop = false; this.txtGSDXDirectory.Enter += new System.EventHandler(this.txtGSDXDirectory_Enter); this.txtGSDXDirectory.Leave += new System.EventHandler(this.txtGSDXDirectory_Leave); + this.txtGSDXDirectory.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtGSDXDirectory_KeyDown); // // lblDirectory // @@ -147,6 +148,7 @@ this.txtDumpsDirectory.TabStop = false; this.txtDumpsDirectory.Enter += new System.EventHandler(this.txtDumpsDirectory_Enter); this.txtDumpsDirectory.Leave += new System.EventHandler(this.txtDumpsDirectory_Leave); + this.txtDumpsDirectory.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtDumpsDirectory_KeyDown); // // lstGSDX // diff --git a/tools/GSDumpGUI/Forms/frmMain.cs b/tools/GSDumpGUI/Forms/frmMain.cs index c7ef5c780c..68441b5eea 100644 --- a/tools/GSDumpGUI/Forms/frmMain.cs +++ b/tools/GSDumpGUI/Forms/frmMain.cs @@ -494,7 +494,7 @@ namespace GSDumpGUI private void GSDumpGUI_KeyDown(object sender, KeyEventArgs e) { - if (e.KeyCode == Keys.Return) + if (e.KeyCode == Keys.Return && !txtGSDXDirectory.Focused && !txtDumpsDirectory.Focused) cmdRun_Click(sender, e); if (e.KeyCode == Keys.F1) @@ -524,7 +524,22 @@ namespace GSDumpGUI private void txtGSDXDirectory_Leave(object sender, EventArgs e) { string newpath = txtGSDXDirectory.Text; + if (!_gsdxPathOld.ToLower().Equals(newpath.ToLower())) + txtGSDXDirectory.Text = _gsdxPathOld; + } + private void txtDumpsDirectory_Leave(object sender, EventArgs e) + { + string newpath = txtDumpsDirectory.Text; + if(!_dumpPathOld.ToLower().Equals(newpath.ToLower())) + txtDumpsDirectory.Text = _dumpPathOld; + } + + private void txtGSDXDirectory_KeyDown(object sender, KeyEventArgs e) + { + if (e.KeyCode != Keys.Return) return; + + string newpath = txtGSDXDirectory.Text; if (!String.IsNullOrEmpty(newpath) && !_gsdxPathOld.ToLower().Equals(newpath.ToLower()) && Directory.Exists(newpath)) @@ -536,10 +551,11 @@ namespace GSDumpGUI } } - private void txtDumpsDirectory_Leave(object sender, EventArgs e) + private void txtDumpsDirectory_KeyDown(object sender, KeyEventArgs e) { - string newpath = txtDumpsDirectory.Text; + if (e.KeyCode != Keys.Return) return; + string newpath = txtDumpsDirectory.Text; if (!String.IsNullOrEmpty(newpath) && !_dumpPathOld.ToLower().Equals(newpath.ToLower()) && Directory.Exists(newpath))