From ed395ca65679ff4c69db3ced8b745f931f4998fc Mon Sep 17 00:00:00 2001 From: adelikat Date: Tue, 26 Nov 2019 16:57:01 -0600 Subject: [PATCH] a few cleanups --- .../CustomControls/InputRoll/InputRoll.Drawing.cs | 6 ++---- BizHawk.sln.DotSettings | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.Drawing.cs b/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.Drawing.cs index 42163c4189..19b6988c27 100644 --- a/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.Drawing.cs +++ b/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.Drawing.cs @@ -260,10 +260,9 @@ namespace BizHawk.Client.EmuHawk } } - string text; int strOffsetX = 0; int strOffsetY = 0; - QueryItemText(f + startRow, col, out text, ref strOffsetX, ref strOffsetY); + QueryItemText(f + startRow, col, out var text, ref strOffsetX, ref strOffsetY); int textWidth = _renderer.MeasureString(text, Font).Width; if (col.Rotatable) @@ -304,7 +303,6 @@ namespace BizHawk.Client.EmuHawk { RollColumn col = visibleColumns[j]; - string text; int strOffsetX = 0; int strOffsetY = 0; Point point = new Point(col.Left.Value + xPadding, RowsToPixels(i) + CellHeightPadding); @@ -320,7 +318,7 @@ namespace BizHawk.Client.EmuHawk _renderer.DrawBitmap(image, new Point(point.X + bitmapOffsetX, point.Y + bitmapOffsetY + CellHeightPadding)); } - QueryItemText(f + startRow, visibleColumns[j], out text, ref strOffsetX, ref strOffsetY); + QueryItemText(f + startRow, visibleColumns[j], out var text, ref strOffsetX, ref strOffsetY); bool rePrep = false; if (_selectedItems.Contains(new Cell { Column = visibleColumns[j], RowIndex = f + startRow })) diff --git a/BizHawk.sln.DotSettings b/BizHawk.sln.DotSettings index 45db384e22..68e4c0d4c4 100644 --- a/BizHawk.sln.DotSettings +++ b/BizHawk.sln.DotSettings @@ -198,6 +198,7 @@ True True True + True True True True