code cleanup

This commit is contained in:
adelikat 2019-12-16 18:18:08 -06:00
parent de6979820d
commit 88830fad4c
3 changed files with 17 additions and 31 deletions

View File

@ -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);
}
}

View File

@ -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;

View File

@ -1,7 +1,5 @@
using System;
using System.Windows.Forms;
using BizHawk.Client.Common;
using BizHawk.Emulation.Cores.Computers.SinclairSpectrum;
namespace BizHawk.Client.EmuHawk