h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-14 00:42:55 +08:00
Code Issues Releases Wiki Activity

Add aspect ratio display and limiting

Browse Source
This commit is contained in:
Dean Herbert 2021-03-16 17:04:22 +09:00
parent 9b70f0ee1f
commit 43359553c1
1 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,7 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using System;
using System.Drawing;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
@ -23,6 +24,15 @@ namespace osu.Game.Overlays.Settings.Sections.Input
private readonly BindableNumber<int> sizeX = new BindableNumber<int> { MinValue = 0 };
private readonly BindableNumber<int> sizeY = new BindableNumber<int> { MinValue = 0 };
private SettingsButton aspectResetButton;
private readonly BindableNumber<float> aspectRatio = new BindableFloat(1)
{
MinValue = 0.5f,
MaxValue = 2,
Precision = 0.01f,
};
protected override string Header => "Tablet";
public TabletSettings(ITabletHandler tabletHandler)
@ -48,6 +58,33 @@ namespace osu.Game.Overlays.Settings.Sections.Input
{
sizeX.Value = val.NewValue.Width;
sizeY.Value = val.NewValue.Height;
float proposedAspectRatio = (float)sizeX.Value / sizeY.Value;
aspectRatio.Value = proposedAspectRatio;
if (proposedAspectRatio < aspectRatio.MinValue || proposedAspectRatio > aspectRatio.MaxValue)
{
// apply aspect ratio restrictions to keep things in a usable state.
// correction is always going to be below 1.
float correction = proposedAspectRatio > aspectRatio.Value
? aspectRatio.Value / proposedAspectRatio
: proposedAspectRatio / aspectRatio.Value;
if (val.NewValue.Width != val.OldValue.Width)
{
if (val.NewValue.Width > val.OldValue.Width)
correction = 1 / correction;
areaSize.Value = new Size(areaSize.Value.Width, (int)(val.NewValue.Height * correction));
}
else
{
if (val.NewValue.Height > val.OldValue.Height)
correction = 1 / correction;
areaSize.Value = new Size((int)(val.NewValue.Width * correction), areaSize.Value.Height);
}
}
}, true);
sizeX.BindValueChanged(val => areaSize.Value = new Size(val.NewValue, areaSize.Value.Height));
@ -97,6 +134,15 @@ namespace osu.Game.Overlays.Settings.Sections.Input
{
LabelText = "Lock aspect ratio",
},
aspectResetButton = new SettingsButton
{
Text = "Take aspect ratio from screen size",
},
new SettingsSlider<float>
{
LabelText = "Aspect Ratio",
Current = aspectRatio
},
new SettingsSlider<int>
{
LabelText = "X Offset",