h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-22 12:48:44 +08:00
Code Issues Releases Wiki Activity

Move hold-to-confirm setting back to gameplay section

Browse Source
This commit is contained in:
Bartłomiej Dach 2020-11-29 22:03:56 +01:00
parent a5c4a8d2e9
commit e0a84ff1dc
2 changed files with 12 additions and 12 deletions
osu.Game/Overlays/Settings/Sections
Gameplay
GeneralSettings.cs
UserInterface
GeneralSettings.cs

12
osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs

@ -5,6 +5,7 @@ using osu.Framework;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Game.Configuration;
using osu.Game.Graphics.UserInterface;
using osu.Game.Rulesets.Scoring;
namespace osu.Game.Overlays.Settings.Sections.Gameplay
@ -63,6 +64,12 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
LabelText = "Always show key overlay",
Current = config.GetBindable<bool>(OsuSetting.KeyOverlay)
},
new SettingsSlider<float, TimeSlider>
{
LabelText = "Hold-to-confirm activation time",
Current = config.GetBindable<float>(OsuSetting.UIHoldActivationDelay),
KeyboardStep = 50
},
new SettingsCheckbox
{
LabelText = "Positional hitsounds",
@ -95,5 +102,10 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
});
}
}
private class TimeSlider : OsuSliderBar<float>
{
public override string TooltipText => Current.Value.ToString("N0") + "ms";
}
}
}

12
osu.Game/Overlays/Settings/Sections/UserInterface/GeneralSettings.cs

@ -4,7 +4,6 @@
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Game.Configuration;
using osu.Game.Graphics.UserInterface;
namespace osu.Game.Overlays.Settings.Sections.UserInterface
{
@ -27,18 +26,7 @@ namespace osu.Game.Overlays.Settings.Sections.UserInterface
LabelText = "Parallax",
Current = config.GetBindable<bool>(OsuSetting.MenuParallax)
},
new SettingsSlider<float, TimeSlider>
{
LabelText = "Hold-to-confirm activation time",
Current = config.GetBindable<float>(OsuSetting.UIHoldActivationDelay),
KeyboardStep = 50
},
};
}
private class TimeSlider : OsuSliderBar<float>
{
public override string TooltipText => Current.Value.ToString("N0") + "ms";
}
}
}