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

MultiHawk - some todos and cleanups

This commit is contained in:
adelikat 2015-03-01 23:30:57 +00:00
parent 5bcc30a832
commit b16d41e92b
3 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Client.MultiHawk/EmulatorWindow.cs
View File

@ -142,7 +142,7 @@ namespace BizHawk.Client.MultiHawk
}
else // text mode
{
if (true /*Global.MovieSession.HandleMovieLoadState(path) */) // TODO
if (Global.MovieSession.HandleMovieLoadState(path))
{
using (var reader = new StreamReader(path))
{

1
BizHawk.Client.MultiHawk/Mainform.Designer.cs generated
View File

@ -393,7 +393,6 @@
this.Name = "Mainform";
this.Text = "MultiHawk";
this.Load += new System.EventHandler(this.Mainform_Load);
this.ResizeEnd += new System.EventHandler(this.Mainform_ResizeEnd);
this.MainformMenu.ResumeLayout(false);
this.MainformMenu.PerformLayout();
this.WorkspacePanel.ResumeLayout(false);

35
BizHawk.Client.MultiHawk/Mainform.cs
View File

@ -48,8 +48,7 @@ namespace BizHawk.Client.MultiHawk
MovieControllerAdapter = MovieService.DefaultInstance.LogGeneratorInstance().MovieControllerAdapter,
MessageCallback = AddMessage,
// TODO
//AskYesNoCallback = StateErrorAskUser,
AskYesNoCallback = StateErrorAskUser,
PauseCallback = PauseEmulator,
ModeChangedCallback = SetMainformMovieInfo
};
@ -100,6 +99,18 @@ namespace BizHawk.Client.MultiHawk
}
}
private static bool StateErrorAskUser(string title, string message)
{
var result = MessageBox.Show(
message,
title,
MessageBoxButtons.YesNo,
MessageBoxIcon.Question
);
return result == DialogResult.Yes;
}
private void Mainform_Load(object sender, EventArgs e)
{
SetMainformMovieInfo();
@ -301,7 +312,7 @@ namespace BizHawk.Client.MultiHawk
GL = new Bizware.BizwareGL.Drivers.OpenTK.IGL_TK(),
GLManager = new GLManager(),
Game = loader.Game,
CurrentRomPath = path
CurrentRomPath = loader.CanonicalFullPath
};
nextComm.RequestGLContext = () => ew.GLManager.CreateGLContext();
@ -318,7 +329,7 @@ namespace BizHawk.Client.MultiHawk
WorkspacePanel.Controls.Add(ew);
ew.Show();
Global.Config.RecentRoms.Add(path);
Global.Config.RecentRoms.Add(loader.CanonicalFullPath);
if (EmulatorWindows.Count == 1)
{
@ -346,7 +357,6 @@ namespace BizHawk.Client.MultiHawk
return true;
}
// TODO
// modals that need to capture input for binding purposes get input, of course
if (ActiveForm is HotkeyConfig
|| ActiveForm is ControllerConfig
@ -357,12 +367,6 @@ namespace BizHawk.Client.MultiHawk
return true;
}
//// if no form is active on this process, then the background input setting applies
//if (ActiveForm == null && Global.Config.AcceptBackgroundInput)
//{
// return true;
//}
return false;
}
}
@ -1404,14 +1408,5 @@ namespace BizHawk.Client.MultiHawk
ew.Render();
}
}
private void Mainform_ResizeEnd(object sender, EventArgs e)
{
//if (Global.Config.SaveWindowPosition)
//{
// Global.Config.MainWidth = this.Width;
// Global.Config.MainHeight = this.Height;
//}
}
}
}