From 291a14315ddc1768e5a8c04495c01c6e6dc3bc00 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Sat, 18 Mar 2023 11:20:19 +1000 Subject: [PATCH] Use a cache for `tastudio.onqueryitemicon` --- .../tools/Lua/Libraries/TAStudioLuaLibrary.cs | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/Libraries/TAStudioLuaLibrary.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/Libraries/TAStudioLuaLibrary.cs index 275fc63e51..42bf4446a8 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Lua/Libraries/TAStudioLuaLibrary.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Lua/Libraries/TAStudioLuaLibrary.cs @@ -16,6 +16,8 @@ namespace BizHawk.Client.EmuHawk [LuaLibrary(released: true)] public sealed class TAStudioLuaLibrary : LuaLibraryBase { + private static readonly IDictionary _iconCache = new Dictionary(); + public ToolManager Tools { get; set; } public TAStudioLuaLibrary(ILuaLibraries luaLibsImpl, ApiContainer apiContainer, Action logOutputCallback) @@ -505,7 +507,7 @@ namespace BizHawk.Client.EmuHawk } [LuaMethodExample("tastudio.onqueryitemicon( function( currentindex, itemname )\r\n\tconsole.log( \"called during the icon draw event of the tastudio listview. luaf must be a function that takes 2 params: index, column. The first is the integer row index of the listview, and the 2nd is the string column name. luaf should return a value that can be parsed into a .NET Color object (string color name, or integer value)\" );\r\nend );")] - [LuaMethod("onqueryitemicon", "Called during the icon draw event of the tastudio listview. {{luaf}} must be a function that takes 2 params: {{(index, column)}}. The first is the integer row index of the listview, and the 2nd is the string column name. The callback should return a string, the path to the image file to be displayed.")] + [LuaMethod("onqueryitemicon", "Called during the icon draw event of the tastudio listview. {{luaf}} must be a function that takes 2 params: {{(index, column)}}. The first is the integer row index of the listview, and the 2nd is the string column name. The callback should return a string, the path to the {{.ico}} file to be displayed. The file will be cached, so if you change the file on disk, call {{tastudio.clearIconCache()}}.")] public void OnQueryItemIcon(LuaFunction luaf) { if (Engaged()) @@ -516,7 +518,7 @@ namespace BizHawk.Client.EmuHawk if (result?[0] != null) { string path = result[0].ToString(); - Icon icon = new Icon(path); + if (!_iconCache.TryGetValue(path, out var icon)) _iconCache[path] = icon = new(path); return icon.ToBitmap(); } @@ -525,6 +527,14 @@ namespace BizHawk.Client.EmuHawk } } + [LuaMethodExample("tastudio.clearIconCache();")] + [LuaMethod("clearIconCache", "Clears the cache that is built up by using {{tastudio.onqueryitemicon}}, so that changes to the icons on disk can be picked up.")] + public void ClearIconCache() + { + foreach (var icon in _iconCache.Values) icon.Dispose(); + _iconCache.Clear(); + } + [LuaMethodExample("tastudio.ongreenzoneinvalidated( function( currentindex )\r\n\tconsole.log( \"Called whenever the greenzone is invalidated.\" );\r\nend );")] [LuaMethod("ongreenzoneinvalidated", "Called whenever the greenzone is invalidated. Your callback can have 1 parameter, which will be the index of the first row that was invalidated.")] public void OnGreenzoneInvalidated(LuaFunction luaf)