From c2b942d9a424851b7db99fc64c328b10fb423b72 Mon Sep 17 00:00:00 2001 From: adelikat Date: Tue, 3 Dec 2019 18:57:50 -0600 Subject: [PATCH] InputRoll - remove some vestigial code --- .../CustomControls/InputRoll/InputRoll.cs | 18 +----------------- .../TAStudio/BookmarksBranchesBox.Designer.cs | 1 - .../tools/TAStudio/MarkerControl.Designer.cs | 1 - .../tools/TAStudio/TAStudio.Designer.cs | 1 - .../tools/TAStudio/TAStudio.cs | 1 - 5 files changed, 1 insertion(+), 21 deletions(-) diff --git a/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs b/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs index a5d48cae76..d889802d0b 100644 --- a/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs +++ b/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs @@ -31,7 +31,6 @@ namespace BizHawk.Client.EmuHawk private RollColumns _columns = new RollColumns(); private bool _horizontalOrientation; private bool _programmaticallyUpdatingScrollBarValues; - private int _maxCharactersInHorizontal = 1; private int _rowCount; private SizeF _charSize; @@ -573,21 +572,6 @@ namespace BizHawk.Client.EmuHawk [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] public bool IsPaintDown { get; private set; } - /// - /// Gets or sets the width of data cells when in Horizontal orientation. - /// - [Browsable(false)] - [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] - public int MaxCharactersInHorizontal - { - get => _maxCharactersInHorizontal; - set - { - _maxCharactersInHorizontal = value; - UpdateCellSize(); - } - } - [Browsable(false)] [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] public bool RightButtonHeld { get; private set; } @@ -1949,7 +1933,7 @@ namespace BizHawk.Client.EmuHawk // TODO: Should we round instead of truncate? CellHeight = (int)_charSize.Height + (CellHeightPadding * 2); - CellWidth = (int)(_charSize.Width * MaxCharactersInHorizontal) + (CellWidthPadding * 4); // Double the padding for horizontal because it looks better + CellWidth = (int)_charSize.Width + (CellWidthPadding * 4); // Double the padding for horizontal because it looks better ColumnWidth = CellWidth; ColumnHeight = CellHeight + 2; diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.Designer.cs index 829f631671..34d55b1db2 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.Designer.cs @@ -163,7 +163,6 @@ this.BranchView.LagFramesToHide = 0; this.BranchView.LetKeysModifySelection = false; this.BranchView.Location = new System.Drawing.Point(6, 19); - this.BranchView.MaxCharactersInHorizontal = 1; this.BranchView.MultiSelect = false; this.BranchView.Name = "BranchView"; this.BranchView.RowCount = 0; diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.Designer.cs index 28206f6351..370880e48b 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.Designer.cs @@ -202,7 +202,6 @@ this.MarkerView.LagFramesToHide = 0; this.MarkerView.LetKeysModifySelection = false; this.MarkerView.Location = new System.Drawing.Point(6, 19); - this.MarkerView.MaxCharactersInHorizontal = 1; this.MarkerView.MultiSelect = false; this.MarkerView.Name = "MarkerView"; this.MarkerView.RowCount = 0; diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs index 8a3c9b141a..b065ed807a 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs @@ -1237,7 +1237,6 @@ this.TasView.LagFramesToHide = 0; this.TasView.LetKeysModifySelection = true; this.TasView.Location = new System.Drawing.Point(3, 0); - this.TasView.MaxCharactersInHorizontal = 1; this.TasView.MultiSelect = false; this.TasView.Name = "TasView"; this.TasView.Rotatable = true; diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs index 4dd27fea72..e9503672c1 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs @@ -136,7 +136,6 @@ namespace BizHawk.Client.EmuHawk TasView.QueryFrameLag += TasView_QueryFrameLag; TasView.PointedCellChanged += TasView_PointedCellChanged; TasView.MultiSelect = true; - TasView.MaxCharactersInHorizontal = 1; LastPositionFrame = -1; }