empathicqubit/Mesen-X
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UI: Fixed key select screen being shown behind current form when option to display window on top is enabled

Browse source
This commit is contained in:
Sour 2020-02-01 12:39:12 -05:00
parent c519ec3ec8
commit 81dbafe405
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
GUI.NET/Forms/Config/BaseInputConfigControl.cs
View file

@ -69,7 +69,7 @@ namespace Mesen.GUI.Forms.Config
protected void btnMapping_Click(object sender, EventArgs e) protected void btnMapping_Click(object sender, EventArgs e)
{ {
using(frmGetKey frm = new frmGetKey(true)) { using(frmGetKey frm = new frmGetKey(true)) {
frm.ShowDialog(); ((Form)frm).ShowDialog(this);
((Button)sender).Text = frm.ShortcutKey.ToString(); ((Button)sender).Text = frm.ShortcutKey.ToString();
((Button)sender).Tag = frm.ShortcutKey.Key1; ((Button)sender).Tag = frm.ShortcutKey.Key1;
} }

2
GUI.NET/Forms/Config/ctrlEmulatorShortcuts.cs
View file

@ -219,7 +219,7 @@ namespace Mesen.GUI.Forms.Config
CheckConflicts(); CheckConflicts();
} else if(e.Button == MouseButtons.Left) { } else if(e.Button == MouseButtons.Left) {
using(frmGetKey frm = new frmGetKey(false)) { using(frmGetKey frm = new frmGetKey(false)) {
frm.ShowDialog(); ((Form)frm).ShowDialog(this);
button.Value = frm.ShortcutKey.ToString(); button.Value = frm.ShortcutKey.ToString();
button.Tag = frm.ShortcutKey; button.Tag = frm.ShortcutKey;