sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-06-08 12:58:01 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21205 from Samaoo/fix-tablet-aspect-ratio-values

Browse Source 
Fix incorrect rounding of tablet aspect ratio values
This commit is contained in:
Bartłomiej Dach 2022-11-19 15:08:53 +01:00 committed by GitHub
commit 9724c6bb53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
View File

@ -125,11 +125,11 @@ namespace osu.Game.Overlays.Settings.Sections.Input
{ {
usableAreaContainer.ResizeTo(val.NewValue, 100, Easing.OutQuint); usableAreaContainer.ResizeTo(val.NewValue, 100, Easing.OutQuint);
int x = (int)val.NewValue.X; int x = (int)Math.Round(val.NewValue.X);
int y = (int)val.NewValue.Y; int y = (int)Math.Round(val.NewValue.Y);
int commonDivider = greatestCommonDivider(x, y); int commonDivider = greatestCommonDivider(x, y);
usableAreaText.Text = $"{(float)x / commonDivider}:{(float)y / commonDivider}"; usableAreaText.Text = $"{x / commonDivider}:{y / commonDivider}";
checkBounds(); checkBounds();
}, true); }, true);

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

@ -3,7 +3,6 @@
#nullable disable #nullable disable
using System;
using osu.Framework; using osu.Framework;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Bindables; using osu.Framework.Bindables;
@ -327,7 +326,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
{ {
aspectLock.Value = false; aspectLock.Value = false;
int proposedHeight = getHeight(sizeX.Value, aspectRatio); float proposedHeight = getHeight(sizeX.Value, aspectRatio);
if (proposedHeight < sizeY.MaxValue) if (proposedHeight < sizeY.MaxValue)
sizeY.Value = proposedHeight; sizeY.Value = proposedHeight;
@ -344,8 +343,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
private float currentAspectRatio => sizeX.Value / sizeY.Value; private float currentAspectRatio => sizeX.Value / sizeY.Value;
private static int getHeight(float width, float aspectRatio) => (int)Math.Round(width / aspectRatio); private static float getHeight(float width, float aspectRatio) => width / aspectRatio;
private static int getWidth(float height, float aspectRatio) => (int)Math.Round(height * aspectRatio); private static float getWidth(float height, float aspectRatio) => height * aspectRatio;
} }
} }