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

Lua Console - fix double click toggle and unify logic between double click and toggle menu items

This commit is contained in:
adelikat 2019-11-16 12:01:43 -06:00
parent 6024af5dbc
commit c1ba930e64
1 changed files with 37 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
View File

@ -322,7 +322,6 @@ namespace BizHawk.Client.EmuHawk
private void UpdateDialog() private void UpdateDialog()
{ {
LuaListView.RowCount = LuaImp.ScriptList.Count; LuaListView.RowCount = LuaImp.ScriptList.Count;
LuaListView.Refresh();
UpdateNumberOfScripts(); UpdateNumberOfScripts();
UpdateRegisteredFunctionsDialog(); UpdateRegisteredFunctionsDialog();
} }
@ -854,38 +853,15 @@ namespace BizHawk.Client.EmuHawk
private void ToggleScriptMenuItem_Click(object sender, EventArgs e) private void ToggleScriptMenuItem_Click(object sender, EventArgs e)
{ {
var files = !SelectedFiles.Any() && Global.Config.ToggleAllIfNoneSelected ? LuaImp.ScriptList : SelectedFiles; var files = !SelectedFiles.Any() && Global.Config.ToggleAllIfNoneSelected
? LuaImp.ScriptList
: SelectedFiles;
foreach (var file in files) foreach (var file in files)
{ {
file.Toggle(); ToggleLuaScript(file);
if (file.Enabled && file.Thread == null)
{
EnableLuaFile(file);
}
else if (!file.Enabled && file.Thread != null)
{
LuaImp.CallExitEvent(file);
foreach (var selectedItem in SelectedItems)
{
var temp = selectedItem;
LuaImp.RegisteredFunctions.RemoveAll(lf => lf.Lua == temp.Thread);
UpdateRegisteredFunctionsDialog();
}
LuaImp.CallExitEvent(file);
file.Stop();
if (Global.Config.RemoveRegisteredFunctionsOnToggle)
{
LuaImp.RegisteredFunctions.ClearAll();
}
}
} }
UpdateDialog(); UpdateDialog();
UpdateNumberOfScripts();
LuaListView.Refresh();
} }
private void EnableLuaFile(LuaFile item) private void EnableLuaFile(LuaFile item)
@ -1467,10 +1443,40 @@ namespace BizHawk.Client.EmuHawk
if (index < LuaImp.ScriptList.Count) if (index < LuaImp.ScriptList.Count)
{ {
var file = LuaImp.ScriptList[index.Value]; var file = LuaImp.ScriptList[index.Value];
if (!file.IsSeparator) ToggleLuaScript(file);
UpdateDialog();
}
}
private void ToggleLuaScript(LuaFile file)
{
if (file.IsSeparator)
{
return;
}
file.Toggle();
if (file.Enabled && file.Thread == null)
{
EnableLuaFile(file);
}
else if (!file.Enabled && file.Thread != null)
{
LuaImp.CallExitEvent(file);
foreach (var selectedItem in SelectedItems)
{ {
file.Toggle(); var temp = selectedItem;
UpdateDialog(); LuaImp.RegisteredFunctions.RemoveAll(lf => lf.Lua == temp.Thread);
UpdateRegisteredFunctionsDialog();
}
LuaImp.CallExitEvent(file);
file.Stop();
if (Global.Config.RemoveRegisteredFunctionsOnToggle)
{
LuaImp.RegisteredFunctions.ClearAll();
} }
} }
} }