h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 06:17:23 +08:00
Code Issues Releases Wiki Activity

move tablet area calculations to functions

Browse Source
This commit is contained in:
Samaoo 2022-11-09 20:14:01 +01:00
parent 533a2db5ea
commit be81c658af
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
View File

@ -309,9 +309,9 @@ namespace osu.Game.Overlays.Settings.Sections.Input
// if lock is applied (or the specified values were out of range) aim to adjust the axis the user was not adjusting to conform.
if (sizeChanged == sizeX)
sizeY.Value = (int)Math.Round(areaSize.Value.X / aspectRatio.Value);
sizeY.Value = getHeight(areaSize.Value.X, aspectRatio.Value);
else
sizeX.Value = (int)Math.Round(areaSize.Value.Y * aspectRatio.Value);
sizeX.Value = getWidth(areaSize.Value.Y, aspectRatio.Value);
}
finally
{
@ -325,12 +325,12 @@ namespace osu.Game.Overlays.Settings.Sections.Input
{
aspectLock.Value = false;
int proposedHeight = (int)Math.Round(sizeX.Value / aspectRatio);
int proposedHeight = getHeight(sizeX.Value, aspectRatio);
if (proposedHeight < sizeY.MaxValue)
sizeY.Value = proposedHeight;
else
sizeX.Value = (int)Math.Round(sizeY.Value * aspectRatio);
sizeX.Value = getWidth(sizeY.Value, aspectRatio);
updateAspectRatio();
@ -341,5 +341,9 @@ namespace osu.Game.Overlays.Settings.Sections.Input
private void updateAspectRatio() => aspectRatio.Value = currentAspectRatio;
private float currentAspectRatio => sizeX.Value / sizeY.Value;
private static int getHeight(float width, float aspectRatio) => (int)Math.Round(width / aspectRatio);
private static int getWidth(float height, float aspectRatio) => (int)Math.Round(height * aspectRatio);
}
}