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

s/OptionsSlider/SliderOption/g

Browse Source
This commit is contained in:
Drew DeVault 2016-12-01 17:31:21 -05:00
parent b97902d006
commit ff7ec88e66
9 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Overlays/Options/Audio/OffsetAdjustmentOptions.cs
View File

@ -19,9 +19,9 @@ namespace osu.Game.Overlays.Options.Audio
{ {
Children = new Drawable[] Children = new Drawable[]
{ {
new OptionsSlider<int> new SliderOption<int>
{ {
Label = "Universal Offset", LabelText = "Universal Offset",
Bindable = (BindableInt)config.GetBindable<int>(OsuConfig.Offset) Bindable = (BindableInt)config.GetBindable<int>(OsuConfig.Offset)
}, },
new OsuButton new OsuButton

6
osu.Game/Overlays/Options/Audio/VolumeOptions.cs
View File

@ -20,9 +20,9 @@ namespace osu.Game.Overlays.Options.Audio
{ {
Children = new Drawable[] Children = new Drawable[]
{ {
new OptionsSlider<double> { Label = "Master", Bindable = audio.Volume }, new SliderOption<double> { LabelText = "Master", Bindable = audio.Volume },
new OptionsSlider<double> { Label = "Effect", Bindable = audio.VolumeSample }, new SliderOption<double> { LabelText = "Effect", Bindable = audio.VolumeSample },
new OptionsSlider<double> { Label = "Music", Bindable = audio.VolumeTrack }, new SliderOption<double> { LabelText = "Music", Bindable = audio.VolumeTrack },
new CheckBoxOption new CheckBoxOption
{ {
LabelText = "Ignore beatmap hitsounds", LabelText = "Ignore beatmap hitsounds",

8
osu.Game/Overlays/Options/Gameplay/GeneralGameplayOptions.cs
View File

@ -20,16 +20,16 @@ namespace osu.Game.Overlays.Options.Gameplay
{ {
Children = new Drawable[] Children = new Drawable[]
{ {
new OptionsSlider<int> new SliderOption<int>
{ {
Label = "Background dim", LabelText = "Background dim",
Bindable = (BindableInt)config.GetBindable<int>(OsuConfig.DimLevel) Bindable = (BindableInt)config.GetBindable<int>(OsuConfig.DimLevel)
}, },
new SpriteText { Text = "Progress display: TODO dropdown" }, new SpriteText { Text = "Progress display: TODO dropdown" },
new SpriteText { Text = "Score meter type: TODO dropdown" }, new SpriteText { Text = "Score meter type: TODO dropdown" },
new OptionsSlider<double> new SliderOption<double>
{ {
Label = "Score meter size", LabelText = "Score meter size",
Bindable = (BindableDouble)config.GetBindable<double>(OsuConfig.ScoreMeterScale) Bindable = (BindableDouble)config.GetBindable<double>(OsuConfig.ScoreMeterScale)
}, },
new CheckBoxOption new CheckBoxOption

4
osu.Game/Overlays/Options/Gameplay/SongSelectGameplayOptions.cs
View File

@ -25,9 +25,9 @@ namespace osu.Game.Overlays.Options.Gameplay
starMaximum = (BindableInt)config.GetBindable<int>(OsuConfig.DisplayStarsMaximum); starMaximum = (BindableInt)config.GetBindable<int>(OsuConfig.DisplayStarsMaximum);
Children = new Drawable[] Children = new Drawable[]
{ {
new OptionsSlider<int> { Label = "Display beatmaps from", Bindable = starMinimum }, new SliderOption<int> { LabelText = "Display beatmaps from", Bindable = starMinimum },
counterMin = new StarCounter { Count = starMinimum.Value }, counterMin = new StarCounter { Count = starMinimum.Value },
new OptionsSlider<int> { Label = "up to", Bindable = starMaximum }, new SliderOption<int> { LabelText = "up to", Bindable = starMaximum },
counterMax = new StarCounter { Count = starMaximum.Value }, counterMax = new StarCounter { Count = starMaximum.Value },
}; };
starMinimum.ValueChanged += starValueChanged; starMinimum.ValueChanged += starValueChanged;

8
osu.Game/Overlays/Options/Graphics/LayoutOptions.cs
View File

@ -31,14 +31,14 @@ namespace osu.Game.Overlays.Options.Graphics
LabelText = "Letterboxing", LabelText = "Letterboxing",
Bindable = config.GetBindable<bool>(OsuConfig.Letterboxing), Bindable = config.GetBindable<bool>(OsuConfig.Letterboxing),
}, },
new OptionsSlider<int> new SliderOption<int>
{ {
Label = "Horizontal position", LabelText = "Horizontal position",
Bindable = (BindableInt)config.GetBindable<int>(OsuConfig.LetterboxPositionX) Bindable = (BindableInt)config.GetBindable<int>(OsuConfig.LetterboxPositionX)
}, },
new OptionsSlider<int> new SliderOption<int>
{ {
Label = "Vertical position", LabelText = "Vertical position",
Bindable = (BindableInt)config.GetBindable<int>(OsuConfig.LetterboxPositionY) Bindable = (BindableInt)config.GetBindable<int>(OsuConfig.LetterboxPositionY)
}, },
}; };

4
osu.Game/Overlays/Options/Input/MouseOptions.cs
View File

@ -27,9 +27,9 @@ namespace osu.Game.Overlays.Options.Input
Children = new Drawable[] Children = new Drawable[]
{ {
new SpriteText { Text = "Sensitivity: TODO slider" }, new SpriteText { Text = "Sensitivity: TODO slider" },
new OptionsSlider<double> new SliderOption<double>
{ {
Label = "Sensitivity", LabelText = "Sensitivity",
Bindable = (BindableDouble)config.GetBindable<double>(OsuConfig.MouseSpeed), Bindable = (BindableDouble)config.GetBindable<double>(OsuConfig.MouseSpeed),
}, },
rawInput = new CheckBoxOption rawInput = new CheckBoxOption

4
osu.Game/Overlays/Options/SkinSection.cs
View File

@ -63,9 +63,9 @@ namespace osu.Game.Overlays.Options
Bindable = config.GetBindable<bool>(OsuConfig.UseSkinCursor) Bindable = config.GetBindable<bool>(OsuConfig.UseSkinCursor)
}, },
new SpriteText { Text = "Cursor size: TODO slider" }, new SpriteText { Text = "Cursor size: TODO slider" },
new OptionsSlider<double> new SliderOption<double>
{ {
Label = "Cursor size", LabelText = "Cursor size",
Bindable = (BindableDouble)config.GetBindable<double>(OsuConfig.CursorSize) Bindable = (BindableDouble)config.GetBindable<double>(OsuConfig.CursorSize)
}, },
new CheckBoxOption new CheckBoxOption

6
osu.Game/Overlays/Options/OptionsSlider.cs → osu.Game/Overlays/Options/SliderOption.cs
View File

@ -9,13 +9,13 @@ using osu.Framework.Graphics.UserInterface;
namespace osu.Game.Overlays.Options namespace osu.Game.Overlays.Options
{ {
public class OptionsSlider<T> : FlowContainer where T : struct, public class SliderOption<T> : FlowContainer where T : struct,
IComparable, IFormattable, IConvertible, IComparable<T>, IEquatable<T> IComparable, IFormattable, IConvertible, IComparable<T>, IEquatable<T>
{ {
private SliderBar<T> slider; private SliderBar<T> slider;
private SpriteText text; private SpriteText text;
public string Label public string LabelText
{ {
get { return text.Text; } get { return text.Text; }
set set
@ -31,7 +31,7 @@ namespace osu.Game.Overlays.Options
set { slider.Bindable = value; } set { slider.Bindable = value; }
} }
public OptionsSlider() public SliderOption()
{ {
Direction = FlowDirection.VerticalOnly; Direction = FlowDirection.VerticalOnly;
RelativeSizeAxes = Axes.X; RelativeSizeAxes = Axes.X;

2
osu.Game/osu.Game.csproj
View File

@ -222,7 +222,7 @@
<Compile Include="Overlays\Options\CheckBoxOption.cs" /> <Compile Include="Overlays\Options\CheckBoxOption.cs" />
<Compile Include="Overlays\Options\SidebarButton.cs" /> <Compile Include="Overlays\Options\SidebarButton.cs" />
<Compile Include="Overlays\Options\TextBoxOption.cs" /> <Compile Include="Overlays\Options\TextBoxOption.cs" />
<Compile Include="Overlays\Options\OptionsSlider.cs" /> <Compile Include="Overlays\Options\SliderOption.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="$(SolutionDir)\osu-framework\osu.Framework\osu.Framework.csproj"> <ProjectReference Include="$(SolutionDir)\osu-framework\osu.Framework\osu.Framework.csproj">