From b51bb85c829f5e2d9aad035e8ab11c579f452265 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Sun, 25 Aug 2024 16:38:04 +1000 Subject: [PATCH] Replace `LuaPictureBox` prop init with constructor --- .../tools/Lua/Libraries/FormsLuaLibrary.cs | 2 +- src/BizHawk.Client.EmuHawk/tools/Lua/LuaCanvas.cs | 3 +-- src/BizHawk.Client.EmuHawk/tools/Lua/LuaPictureBox.cs | 5 +++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/Libraries/FormsLuaLibrary.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/Libraries/FormsLuaLibrary.cs index 10bd0eda65..187ac28a91 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Lua/Libraries/FormsLuaLibrary.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Lua/Libraries/FormsLuaLibrary.cs @@ -305,7 +305,7 @@ namespace BizHawk.Client.EmuHawk return 0; } - var pictureBox = new LuaPictureBox { TableHelper = _th }; + LuaPictureBox pictureBox = new(_th); form.Controls.Add(pictureBox); const string FUNC_NAME = "forms.pictureBox"; ProcessPositionArguments(x: x, y: y, pictureBox, functionName: FUNC_NAME); diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaCanvas.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaCanvas.cs index e089d4dde2..f9f96f6068 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaCanvas.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaCanvas.cs @@ -56,7 +56,7 @@ namespace BizHawk.Client.EmuHawk } } - luaPictureBox = new LuaPictureBox + luaPictureBox = new(_th) { Image = Properties.Resources.LuaPictureBox, Location = new Point(0, 0), @@ -65,7 +65,6 @@ namespace BizHawk.Client.EmuHawk Size = new Size(100, 50), SizeMode = PictureBoxSizeMode.AutoSize, TabIndex = 0, - TableHelper = _th, TabStop = false }; Controls.Add(luaPictureBox); diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaPictureBox.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaPictureBox.cs index adf4c4f8cd..83a88fd5f7 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaPictureBox.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaPictureBox.cs @@ -17,7 +17,7 @@ namespace BizHawk.Client.EmuHawk private readonly Dictionary _solidBrushes = new Dictionary(); private readonly Dictionary _pens = new Dictionary(); - internal NLuaTableHelper TableHelper { get; set; } + private readonly NLuaTableHelper TableHelper; private SolidBrush GetBrush([LuaColorParam] object color) => _solidBrushes.GetValueOrPutNew1(TableHelper.ParseColor(color)); @@ -29,9 +29,10 @@ namespace BizHawk.Client.EmuHawk private Color? _defaultBackground; private Color? _defaultTextBackground = Color.FromArgb(128, 0, 0, 0); - public LuaPictureBox() + public LuaPictureBox(NLuaTableHelper tableHelper) { Image = new Bitmap(Width, Height); + TableHelper = tableHelper; } public void LuaResize(int width, int height)