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

UI: Fixed some forms 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:23 -05:00
parent bd79d7765a
commit b53fcbfc46
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
UI/Forms/Config/Controllers/BaseInputConfigControl.cs
View file

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

2
UI/Forms/Config/ctrlEmulatorShortcuts.cs
View file

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

2
UI/Forms/frmMain.cs
View file

@ -364,7 +364,7 @@ namespace Mesen.GUI.Forms
{
mnuConnect.Click += (s, e) => { NetPlayHelper.Connect(); };
mnuStartServer.Click += (s, e) => { NetPlayHelper.ToggleServer(); };
mnuProfile.Click += (s, e) => { using(frmPlayerProfile frm = new frmPlayerProfile()) { frm.ShowDialog(); } };
mnuProfile.Click += (s, e) => { using(frmPlayerProfile frm = new frmPlayerProfile()) { frm.ShowDialog(mnuProfile, this); } };
mnuNetPlayPlayer1.Click += (s, e) => { NetplayApi.NetPlaySelectController(0); };
mnuNetPlayPlayer2.Click += (s, e) => { NetplayApi.NetPlaySelectController(1); };
mnuNetPlayPlayer3.Click += (s, e) => { NetplayApi.NetPlaySelectController(2); };