From 6356180b6abd5a11ab32508ad3dcd2984c561aee Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Mon, 3 Jan 2022 12:53:58 +0900 Subject: [PATCH] Remove unnecessary code and fix double nesting causing filtering to not work --- .../Sections/Gameplay/AudioSettings.cs | 28 ++++--------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/AudioSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/AudioSettings.cs index 4238ad1605..5029c6a617 100644 --- a/osu.Game/Overlays/Settings/Sections/Gameplay/AudioSettings.cs +++ b/osu.Game/Overlays/Settings/Sections/Gameplay/AudioSettings.cs @@ -2,12 +2,10 @@ // See the LICENCE file in the repository root for full licence text. using osu.Framework.Allocation; -using osu.Framework.Bindables; using osu.Framework.Graphics; using osu.Framework.Localisation; using osu.Game.Configuration; using osu.Game.Localisation; -using osu.Framework.Graphics.Containers; namespace osu.Game.Overlays.Settings.Sections.Gameplay { @@ -15,32 +13,18 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay { protected override LocalisableString Header => GameplaySettingsStrings.AudioHeader; - private Bindable positionalHitsoundsLevel; - - private FillFlowContainer> positionalHitsoundsSettings; - [BackgroundDependencyLoader] private void load(OsuConfigManager config, OsuConfigManager osuConfig) { - positionalHitsoundsLevel = osuConfig.GetBindable(OsuSetting.PositionalHitsoundsLevel); Children = new Drawable[] { - positionalHitsoundsSettings = new FillFlowContainer> + new SettingsSlider { - Direction = FillDirection.Vertical, - RelativeSizeAxes = Axes.X, - AutoSizeAxes = Axes.Y, - Masking = true, - Children = new[] - { - new SettingsSlider - { - LabelText = AudioSettingsStrings.PositionalLevel, - Current = positionalHitsoundsLevel, - KeyboardStep = 0.01f, - DisplayAsPercentage = true - } - } + LabelText = AudioSettingsStrings.PositionalLevel, + Keywords = new[] { @"positional", @"balance" }, + Current = osuConfig.GetBindable(OsuSetting.PositionalHitsoundsLevel), + KeyboardStep = 0.01f, + DisplayAsPercentage = true }, new SettingsCheckbox {