ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Message config - use OSD in mainform not config

This commit is contained in:
adelikat 2019-12-17 14:15:09 -06:00
parent aea444cea5
commit fd30ddc154
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
BizHawk.Client.EmuHawk/MainForm.Events.cs
View File

@ -995,7 +995,10 @@ namespace BizHawk.Client.EmuHawk
private void MessagesMenuItem_Click(object sender, EventArgs e) private void MessagesMenuItem_Click(object sender, EventArgs e)
{ {
using var form = new MessageConfig(); using var form = new MessageConfig();
form.ShowDialog(); var result = form.ShowDialog();
AddOnScreenMessage(result == DialogResult.OK
? "Message settings saved"
: "Message config aborted");
} }
private void PathsMenuItem_Click(object sender, EventArgs e) private void PathsMenuItem_Click(object sender, EventArgs e)

12
BizHawk.Client.EmuHawk/config/MessageConfig.cs
View File

@ -237,7 +237,11 @@ namespace BizHawk.Client.EmuHawk
private void Ok_Click(object sender, EventArgs e) private void Ok_Click(object sender, EventArgs e)
{ {
SaveSettings(); SaveSettings();
GlobalWin.OSD.AddMessage("Message settings saved"); Close();
}
private void Cancel_Click(object sender, EventArgs e)
{
Close(); Close();
} }
@ -260,12 +264,6 @@ namespace BizHawk.Client.EmuHawk
PositionPanel.Refresh(); PositionPanel.Refresh();
} }
private void Cancel_Click(object sender, EventArgs e)
{
GlobalWin.OSD.AddMessage("Message config aborted");
Close();
}
private void PositionPanel_MouseEnter(object sender, EventArgs e) private void PositionPanel_MouseEnter(object sender, EventArgs e)
{ {
Cursor = Cursors.Hand; Cursor = Cursors.Hand;