Merge branch 'master' into drawable-room-update

This commit is contained in:
Dean Herbert
2017-07-14 15:29:27 +09:00
committed by GitHub
30 changed files with 615 additions and 41 deletions

View File

@ -16,7 +16,7 @@ namespace osu.Game.Screens.Play.ReplaySettings
{
Children = new Drawable[]
{
new ReplaySliderBar<double>()
new ReplaySliderBar<double>
{
LabelText = "Playback speed",
Bindable = config.GetBindable<double>(OsuSetting.PlaybackSpeed)

View File

@ -13,7 +13,7 @@ namespace osu.Game.Screens.Play.ReplaySettings
public class ReplaySliderBar<T> : SettingsSlider<T>
where T : struct, IEquatable<T>
{
protected override Drawable CreateControl() => new Sliderbar()
protected override Drawable CreateControl() => new Sliderbar
{
Margin = new MarginPadding { Top = 5, Bottom = 5 },
RelativeSizeAxes = Axes.X

View File

@ -277,9 +277,19 @@ namespace osu.Game.Screens.Play
protected override bool OnClick(InputState state)
{
if (!Enabled)
return false;
box.FlashColour(Color4.White, 500, EasingTypes.OutQuint);
aspect.ScaleTo(1.2f, 2000, EasingTypes.OutQuint);
return base.OnClick(state);
bool result = base.OnClick(state);
// for now, let's disable the skip button after the first press.
// this will likely need to be contextual in the future (bound from external components).
Enabled.Value = false;
return result;
}
}
}

View File

@ -160,7 +160,7 @@ namespace osu.Game.Screens.Select
Colour = Color4.Black,
Alpha = 0.5f,
},
new FillFlowContainer<MetadataSegment>()
new FillFlowContainer<MetadataSegment>
{
Anchor = Anchor.TopRight,
Origin = Anchor.TopRight,

View File

@ -128,7 +128,7 @@ namespace osu.Game.Screens.Select
// Bottom = 5
// },
//},
sortTabs = new OsuTabControl<SortMode>()
sortTabs = new OsuTabControl<SortMode>
{
RelativeSizeAxes = Axes.X,
Width = 0.5f,