From 75fee8c4affc9993e8cee5f000392eb0f10ce30f Mon Sep 17 00:00:00 2001 From: adelikat Date: Sun, 22 Dec 2019 09:28:05 -0600 Subject: [PATCH] pass in docs dependency to LuaFunctionsForm --- BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs | 2 +- .../tools/Lua/LuaFunctionsForm.cs | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs b/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs index 32d28e1633..e17f092cb4 100644 --- a/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs +++ b/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs @@ -1161,7 +1161,7 @@ namespace BizHawk.Client.EmuHawk private void FunctionsListMenuItem_Click(object sender, EventArgs e) { - new LuaFunctionsForm().Show(); + new LuaFunctionsForm(LuaImp.Docs).Show(); } private void OnlineDocsMenuItem_Click(object sender, EventArgs e) diff --git a/BizHawk.Client.EmuHawk/tools/Lua/LuaFunctionsForm.cs b/BizHawk.Client.EmuHawk/tools/Lua/LuaFunctionsForm.cs index c30ec46136..a516856712 100644 --- a/BizHawk.Client.EmuHawk/tools/Lua/LuaFunctionsForm.cs +++ b/BizHawk.Client.EmuHawk/tools/Lua/LuaFunctionsForm.cs @@ -10,11 +10,19 @@ namespace BizHawk.Client.EmuHawk { public partial class LuaFunctionsForm : Form { + private readonly LuaDocumentation _docs; private readonly Sorting _columnSort = new Sorting(); private List _functionList = new List(); private List _filteredList = new List(); + public LuaFunctionsForm(LuaDocumentation docs) + { + _docs = docs; + InitializeComponent(); + FunctionView.RetrieveVirtualItem += FunctionView_QueryItemText; + } + private void GenerateFilteredList() { if (!string.IsNullOrWhiteSpace(FilterBox.Text)) @@ -29,15 +37,9 @@ namespace BizHawk.Client.EmuHawk } } - public LuaFunctionsForm() - { - InitializeComponent(); - FunctionView.RetrieveVirtualItem += FunctionView_QueryItemText; - } - private void LuaFunctionList_Load(object sender, EventArgs e) { - _functionList = GlobalWin.Tools.LuaConsole.LuaImp.Docs + _functionList = _docs .OrderBy(l => l.Library) .ThenBy(l => l.Name) .ToList(); @@ -183,7 +185,7 @@ namespace BizHawk.Client.EmuHawk private void ToWikiMarkupButton_Click(object sender, EventArgs e) { - Clipboard.SetDataObject(GlobalWin.Tools.LuaConsole.LuaImp.Docs.ToTASVideosWikiMarkup()); + Clipboard.SetDataObject(_docs.ToTASVideosWikiMarkup()); } } }