InputPromt: Signed and Unsigned behavior was backwards.
TAStudio: -Handle wheel scroll speed when changing orientation. -Save wheel scroll speed setting. -DrawInput setting was not being properly loaded.
This commit is contained in:
parent
63197300b4
commit
4b669662b4
|
@ -84,7 +84,7 @@ namespace BizHawk.Client.EmuHawk
|
|||
return;
|
||||
}
|
||||
|
||||
if (!e.KeyChar.IsUnsigned())
|
||||
if (!e.KeyChar.IsSigned())
|
||||
{
|
||||
e.Handled = true;
|
||||
}
|
||||
|
@ -95,8 +95,8 @@ namespace BizHawk.Client.EmuHawk
|
|||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if (!e.KeyChar.IsSigned())
|
||||
|
||||
if (!e.KeyChar.IsUnsigned())
|
||||
{
|
||||
e.Handled = true;
|
||||
}
|
||||
|
|
|
@ -24,7 +24,13 @@ namespace BizHawk.Client.EmuHawk
|
|||
private readonly HScrollBar HBar;
|
||||
public int ScrollSpeed
|
||||
{
|
||||
get { return VBar.SmallChange; }
|
||||
get
|
||||
{
|
||||
if (HorizontalOrientation)
|
||||
return HBar.SmallChange / CellWidth;
|
||||
else
|
||||
return VBar.SmallChange / CellHeight;
|
||||
}
|
||||
set
|
||||
{
|
||||
if (HorizontalOrientation)
|
||||
|
@ -162,8 +168,12 @@ namespace BizHawk.Client.EmuHawk
|
|||
{
|
||||
if (_horizontalOrientation != value)
|
||||
{
|
||||
int temp = ScrollSpeed;
|
||||
_horizontalOrientation = value;
|
||||
OrientationChanged();
|
||||
HBar.SmallChange = CellWidth;
|
||||
VBar.SmallChange = CellHeight;
|
||||
ScrollSpeed = temp;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -859,9 +859,10 @@ namespace BizHawk.Client.EmuHawk
|
|||
InputPrompt inputpromt = new InputPrompt();
|
||||
inputpromt.TextInputType = InputPrompt.InputType.Unsigned;
|
||||
inputpromt.Message = "Frames per tick:";
|
||||
inputpromt.InitialValue = "1";
|
||||
inputpromt.InitialValue = TasView.ScrollSpeed.ToString();
|
||||
inputpromt.ShowDialog();
|
||||
TasView.ScrollSpeed = int.Parse(inputpromt.PromptText);
|
||||
Settings.ScrollSpeed = TasView.ScrollSpeed;
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -55,8 +55,8 @@ namespace BizHawk.Client.EmuHawk
|
|||
public bool AutoRestoreLastPosition { get; set; }
|
||||
public bool FollowCursor { get; set; }
|
||||
public bool EmptyMarkers { get; set; }
|
||||
public int ScrollSpeed { get; set; }
|
||||
}
|
||||
int scrollSpeed = 1; // TODO: Save this value somewhere.
|
||||
|
||||
public TasMovie CurrentTasMovie
|
||||
{
|
||||
|
@ -68,7 +68,6 @@ namespace BizHawk.Client.EmuHawk
|
|||
public TAStudio()
|
||||
{
|
||||
InitializeComponent();
|
||||
Settings = new TAStudioSettings();
|
||||
|
||||
// TODO: show this at all times or hide it when saving is done?
|
||||
this.SavingProgressBar.Visible = false;
|
||||
|
@ -85,7 +84,6 @@ namespace BizHawk.Client.EmuHawk
|
|||
TasView.QueryRowBkColor += TasView_QueryRowBkColor;
|
||||
TasView.QueryItemIcon += TasView_QueryItemIcon;
|
||||
TasView.QueryFrameLag += TasView_QueryFrameLag;
|
||||
TasView.InputPaintingMode = Settings.DrawInput;
|
||||
TasView.PointedCellChanged += TasView_PointedCellChanged;
|
||||
TasView.MultiSelect = true;
|
||||
TasView.MaxCharactersInHorizontal = 1;
|
||||
|
@ -151,6 +149,11 @@ namespace BizHawk.Client.EmuHawk
|
|||
};
|
||||
}
|
||||
|
||||
TasView.InputPaintingMode = Settings.DrawInput;
|
||||
if (Settings.ScrollSpeed == 0)
|
||||
Settings.ScrollSpeed = 1; // Default to 1, not 0. TODO: Surely there's a better way?
|
||||
TasView.ScrollSpeed = Settings.ScrollSpeed;
|
||||
|
||||
RefreshDialog();
|
||||
_initialized = true;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue