From 88830fad4c21694b7e20907f55005997081101b0 Mon Sep 17 00:00:00 2001 From: adelikat Date: Mon, 16 Dec 2019 18:18:08 -0600 Subject: [PATCH] code cleanup --- .../config/AnalogRangeConfig.cs | 30 ++++++------------- .../config/AnalogRangeConfigControl.cs | 16 +++++----- .../config/ZXSpectrum/ZXSpectrumPokeMemory.cs | 2 -- 3 files changed, 17 insertions(+), 31 deletions(-) diff --git a/BizHawk.Client.EmuHawk/config/AnalogRangeConfig.cs b/BizHawk.Client.EmuHawk/config/AnalogRangeConfig.cs index 35e8c24092..1f4033ba8a 100644 --- a/BizHawk.Client.EmuHawk/config/AnalogRangeConfig.cs +++ b/BizHawk.Client.EmuHawk/config/AnalogRangeConfig.cs @@ -14,15 +14,11 @@ namespace BizHawk.Client.EmuHawk private int _maxX = 127; private int _maxY = 127; - private bool _radial = false; + private bool _radial; public int MaxX { - get - { - return _maxX; - } - + get => _maxX; set { _maxX = value; @@ -33,11 +29,7 @@ namespace BizHawk.Client.EmuHawk public int MaxY { - get - { - return _maxY; - } - + get => _maxY; set { _maxY = value; @@ -48,11 +40,7 @@ namespace BizHawk.Client.EmuHawk public bool Radial { - get - { - return _radial; - } - + get => _radial; set { _radial = value; @@ -123,7 +111,7 @@ namespace BizHawk.Client.EmuHawk base.OnPaint(e); } - private bool _isDragging = false; + private bool _isDragging; protected override void OnMouseDown(MouseEventArgs e) { @@ -157,11 +145,11 @@ namespace BizHawk.Client.EmuHawk var centerX = Size.Width / 2; var centerY = Size.Height / 2; - var offsetx = Math.Abs(centerX - x) * ScaleFactor; - var offsety = Math.Abs(centerY - y) * ScaleFactor; + var offsetX = Math.Abs(centerX - x) * ScaleFactor; + var offsetY = Math.Abs(centerY - y) * ScaleFactor; - MaxX = Math.Min(offsetx, sbyte.MaxValue); - MaxY = Math.Min(offsety, sbyte.MaxValue); + MaxX = Math.Min(offsetX, sbyte.MaxValue); + MaxY = Math.Min(offsetY, sbyte.MaxValue); } } diff --git a/BizHawk.Client.EmuHawk/config/AnalogRangeConfigControl.cs b/BizHawk.Client.EmuHawk/config/AnalogRangeConfigControl.cs index 4ec059d746..2f2b0ee7c0 100644 --- a/BizHawk.Client.EmuHawk/config/AnalogRangeConfigControl.cs +++ b/BizHawk.Client.EmuHawk/config/AnalogRangeConfigControl.cs @@ -5,7 +5,7 @@ namespace BizHawk.Client.EmuHawk { public partial class AnalogRangeConfigControl : UserControl { - private bool _supressChange; + private bool _suppressChange; public AnalogRangeConfigControl() { @@ -19,28 +19,28 @@ namespace BizHawk.Client.EmuHawk private void XNumeric_ValueChanged(object sender, EventArgs e) { - _supressChange = true; + _suppressChange = true; AnalogRange.MaxX = (int)XNumeric.Value; - _supressChange = false; + _suppressChange = false; } private void YNumeric_ValueChanged(object sender, EventArgs e) { - _supressChange = true; + _suppressChange = true; AnalogRange.MaxY = (int)YNumeric.Value; - _supressChange = false; + _suppressChange = false; } private void RadialCheckbox_CheckedChanged(object sender, EventArgs e) { - _supressChange = true; + _suppressChange = true; AnalogRange.Radial = RadialCheckbox.Checked; - _supressChange = false; + _suppressChange = false; } private void AnalogControlChanged() { - if (!_supressChange) + if (!_suppressChange) { XNumeric.Value = AnalogRange.MaxX; YNumeric.Value = AnalogRange.MaxY; diff --git a/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumPokeMemory.cs b/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumPokeMemory.cs index c806347ea2..96b2160b7c 100644 --- a/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumPokeMemory.cs +++ b/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumPokeMemory.cs @@ -1,7 +1,5 @@ using System; using System.Windows.Forms; - -using BizHawk.Client.Common; using BizHawk.Emulation.Cores.Computers.SinclairSpectrum; namespace BizHawk.Client.EmuHawk