diff --git a/osu.Game/Overlays/Options/Audio/OffsetAdjustmentOptions.cs b/osu.Game/Overlays/Options/Audio/OffsetAdjustmentOptions.cs index edb22f2ed4..df1d6aa9f9 100644 --- a/osu.Game/Overlays/Options/Audio/OffsetAdjustmentOptions.cs +++ b/osu.Game/Overlays/Options/Audio/OffsetAdjustmentOptions.cs @@ -19,9 +19,9 @@ namespace osu.Game.Overlays.Options.Audio { Children = new Drawable[] { - new OptionsSlider + new SliderOption { - Label = "Universal Offset", + LabelText = "Universal Offset", Bindable = (BindableInt)config.GetBindable(OsuConfig.Offset) }, new OsuButton diff --git a/osu.Game/Overlays/Options/Audio/VolumeOptions.cs b/osu.Game/Overlays/Options/Audio/VolumeOptions.cs index f5c209da22..216e2e866d 100644 --- a/osu.Game/Overlays/Options/Audio/VolumeOptions.cs +++ b/osu.Game/Overlays/Options/Audio/VolumeOptions.cs @@ -20,9 +20,9 @@ namespace osu.Game.Overlays.Options.Audio { Children = new Drawable[] { - new OptionsSlider { Label = "Master", Bindable = audio.Volume }, - new OptionsSlider { Label = "Effect", Bindable = audio.VolumeSample }, - new OptionsSlider { Label = "Music", Bindable = audio.VolumeTrack }, + new SliderOption { LabelText = "Master", Bindable = audio.Volume }, + new SliderOption { LabelText = "Effect", Bindable = audio.VolumeSample }, + new SliderOption { LabelText = "Music", Bindable = audio.VolumeTrack }, new CheckBoxOption { LabelText = "Ignore beatmap hitsounds", diff --git a/osu.Game/Overlays/Options/Gameplay/GeneralGameplayOptions.cs b/osu.Game/Overlays/Options/Gameplay/GeneralGameplayOptions.cs index 1fc06afa2a..15607c9bde 100644 --- a/osu.Game/Overlays/Options/Gameplay/GeneralGameplayOptions.cs +++ b/osu.Game/Overlays/Options/Gameplay/GeneralGameplayOptions.cs @@ -20,16 +20,16 @@ namespace osu.Game.Overlays.Options.Gameplay { Children = new Drawable[] { - new OptionsSlider + new SliderOption { - Label = "Background dim", + LabelText = "Background dim", Bindable = (BindableInt)config.GetBindable(OsuConfig.DimLevel) }, new SpriteText { Text = "Progress display: TODO dropdown" }, new SpriteText { Text = "Score meter type: TODO dropdown" }, - new OptionsSlider + new SliderOption { - Label = "Score meter size", + LabelText = "Score meter size", Bindable = (BindableDouble)config.GetBindable(OsuConfig.ScoreMeterScale) }, new CheckBoxOption diff --git a/osu.Game/Overlays/Options/Gameplay/SongSelectGameplayOptions.cs b/osu.Game/Overlays/Options/Gameplay/SongSelectGameplayOptions.cs index 638d12fd4a..63453f336d 100644 --- a/osu.Game/Overlays/Options/Gameplay/SongSelectGameplayOptions.cs +++ b/osu.Game/Overlays/Options/Gameplay/SongSelectGameplayOptions.cs @@ -25,9 +25,9 @@ namespace osu.Game.Overlays.Options.Gameplay starMaximum = (BindableInt)config.GetBindable(OsuConfig.DisplayStarsMaximum); Children = new Drawable[] { - new OptionsSlider { Label = "Display beatmaps from", Bindable = starMinimum }, + new SliderOption { LabelText = "Display beatmaps from", Bindable = starMinimum }, counterMin = new StarCounter { Count = starMinimum.Value }, - new OptionsSlider { Label = "up to", Bindable = starMaximum }, + new SliderOption { LabelText = "up to", Bindable = starMaximum }, counterMax = new StarCounter { Count = starMaximum.Value }, }; starMinimum.ValueChanged += starValueChanged; diff --git a/osu.Game/Overlays/Options/Graphics/LayoutOptions.cs b/osu.Game/Overlays/Options/Graphics/LayoutOptions.cs index cd98eacd10..e050f7c70c 100644 --- a/osu.Game/Overlays/Options/Graphics/LayoutOptions.cs +++ b/osu.Game/Overlays/Options/Graphics/LayoutOptions.cs @@ -31,14 +31,14 @@ namespace osu.Game.Overlays.Options.Graphics LabelText = "Letterboxing", Bindable = config.GetBindable(OsuConfig.Letterboxing), }, - new OptionsSlider + new SliderOption { - Label = "Horizontal position", + LabelText = "Horizontal position", Bindable = (BindableInt)config.GetBindable(OsuConfig.LetterboxPositionX) }, - new OptionsSlider + new SliderOption { - Label = "Vertical position", + LabelText = "Vertical position", Bindable = (BindableInt)config.GetBindable(OsuConfig.LetterboxPositionY) }, }; diff --git a/osu.Game/Overlays/Options/Input/MouseOptions.cs b/osu.Game/Overlays/Options/Input/MouseOptions.cs index 785c55e148..b1a1dfa5bc 100644 --- a/osu.Game/Overlays/Options/Input/MouseOptions.cs +++ b/osu.Game/Overlays/Options/Input/MouseOptions.cs @@ -27,9 +27,9 @@ namespace osu.Game.Overlays.Options.Input Children = new Drawable[] { new SpriteText { Text = "Sensitivity: TODO slider" }, - new OptionsSlider + new SliderOption { - Label = "Sensitivity", + LabelText = "Sensitivity", Bindable = (BindableDouble)config.GetBindable(OsuConfig.MouseSpeed), }, rawInput = new CheckBoxOption diff --git a/osu.Game/Overlays/Options/SkinSection.cs b/osu.Game/Overlays/Options/SkinSection.cs index e69cc1f119..de88570a0e 100644 --- a/osu.Game/Overlays/Options/SkinSection.cs +++ b/osu.Game/Overlays/Options/SkinSection.cs @@ -63,9 +63,9 @@ namespace osu.Game.Overlays.Options Bindable = config.GetBindable(OsuConfig.UseSkinCursor) }, new SpriteText { Text = "Cursor size: TODO slider" }, - new OptionsSlider + new SliderOption { - Label = "Cursor size", + LabelText = "Cursor size", Bindable = (BindableDouble)config.GetBindable(OsuConfig.CursorSize) }, new CheckBoxOption diff --git a/osu.Game/Overlays/Options/OptionsSlider.cs b/osu.Game/Overlays/Options/SliderOption.cs similarity index 91% rename from osu.Game/Overlays/Options/OptionsSlider.cs rename to osu.Game/Overlays/Options/SliderOption.cs index 5f335974be..d00eeebe35 100644 --- a/osu.Game/Overlays/Options/OptionsSlider.cs +++ b/osu.Game/Overlays/Options/SliderOption.cs @@ -9,13 +9,13 @@ using osu.Framework.Graphics.UserInterface; namespace osu.Game.Overlays.Options { - public class OptionsSlider : FlowContainer where T : struct, + public class SliderOption : FlowContainer where T : struct, IComparable, IFormattable, IConvertible, IComparable, IEquatable { private SliderBar slider; private SpriteText text; - public string Label + public string LabelText { get { return text.Text; } set @@ -31,7 +31,7 @@ namespace osu.Game.Overlays.Options set { slider.Bindable = value; } } - public OptionsSlider() + public SliderOption() { Direction = FlowDirection.VerticalOnly; RelativeSizeAxes = Axes.X; diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj index e03f8f3337..2e5367d44b 100644 --- a/osu.Game/osu.Game.csproj +++ b/osu.Game/osu.Game.csproj @@ -222,7 +222,7 @@ - +