From 41cae2dd22b578deddc13ec29646bdbc32f54e82 Mon Sep 17 00:00:00 2001 From: James Groom Date: Wed, 20 Mar 2024 19:46:56 +0000 Subject: [PATCH] Remove unused props from `RollColumn` and `RollColumns` --- .../CustomControls/InputRoll/InputRoll.Drawing.cs | 6 +----- .../CustomControls/InputRoll/RollColumn.cs | 6 ------ .../CustomControls/InputRoll/RollColumns.cs | 4 ---- 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.Drawing.cs b/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.Drawing.cs index 82ef6fe75d..4d7371bc52 100644 --- a/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.Drawing.cs +++ b/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.Drawing.cs @@ -88,11 +88,7 @@ namespace BizHawk.Client.EmuHawk { RollColumn col = visibleColumns[j]; int height = CellHeight; - if (col.Rotatable && col.RotatedHeight != null) - { - height = Math.Max(height, col.RotatedHeight.Value); - } - else if (col.Rotatable) + if (col.Rotatable) { int strOffsetX = 0; int strOffsetY = 0; diff --git a/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/RollColumn.cs b/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/RollColumn.cs index 51ebb632b8..24ea2276a2 100644 --- a/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/RollColumn.cs +++ b/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/RollColumn.cs @@ -2,7 +2,6 @@ { public class RollColumn { - public string Group { get; set; } public int Width { get; set; } public int Left { get; set; } public int Right { get; set; } @@ -23,11 +22,6 @@ /// public bool Rotatable { get; set; } - /// - /// If drawn rotated, specifies the desired height, or null to auto-size - /// - public int? RotatedHeight { get; set; } - /// /// Sets the desired width as appropriate for a display with no scaling. If display /// scaling is enabled, the actual column width will be scaled accordingly. diff --git a/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/RollColumns.cs b/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/RollColumns.cs index 27b846c142..b87491914c 100644 --- a/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/RollColumns.cs +++ b/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/RollColumns.cs @@ -106,9 +106,5 @@ namespace BizHawk.Client.EmuHawk base.Clear(); ColumnsChanged(); } - - public IEnumerable Groups => this - .Select(x => x.Group) - .Distinct(); } }