From 57e3c47bcc9da86dea6500847f5fe7873b264015 Mon Sep 17 00:00:00 2001
From: Morilli <35152647+Morilli@users.noreply.github.com>
Date: Mon, 8 Jul 2024 19:21:35 +0200
Subject: [PATCH] Fix InputRoll not updating CellHeight and CellWidth on
padding change
---
.../CustomControls/InputRoll/InputRoll.cs | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs b/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs
index ede55f46d6..6ac2966fe2 100644
--- a/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs
+++ b/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs
@@ -1952,13 +1952,11 @@ namespace BizHawk.Client.EmuHawk
// The height of a column cell in Vertical Orientation.
private int ColumnHeight => CellHeight + 2;
- // The width of a cell in Horizontal Orientation. Only can be changed by changing the Font or CellPadding.
- private int CellWidth { get; set; }
+ // The width of a cell in Horizontal Orientation.
+ private int CellWidth => (int)_charSize.Width + CellWidthPadding * 4; // Double the padding for horizontal because it looks better
- ///
- /// Gets or sets a value indicating the height of a cell in Vertical Orientation. Only can be changed by changing the Font or CellPadding.
- ///
- private int CellHeight { get; set; } = 8;
+ // The height of a cell in Vertical Orientation.
+ private int CellHeight => (int)_charSize.Height + CellHeightPadding * 2;
///
/// Call when _charSize, MaxCharactersInHorizontal, or CellPadding is changed.
@@ -1971,12 +1969,8 @@ namespace BizHawk.Client.EmuHawk
// Measure width change to ignore extra padding at start/end
var size1 = _renderer.MeasureString("A", Font);
var size2 = _renderer.MeasureString("AA", Font);
- _charSize = new SizeF(size2.Width - size1.Width, size1.Height); // TODO make this a property so changing it updates other values.
+ _charSize = new SizeF(size2.Width - size1.Width, size1.Height);
}
-
- // TODO: Should we round instead of truncate?
- CellHeight = (int)_charSize.Height + (CellHeightPadding * 2);
- CellWidth = (int)_charSize.Width + (CellWidthPadding * 4); // Double the padding for horizontal because it looks better
if (_columns.VisibleColumns.Any())
{