mirror of
https://github.com/osukey/osukey.git
synced 2025-08-05 07:33:55 +09:00
Merge branch 'master' into drawable-room-update
This commit is contained in:
@ -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)
|
||||
|
@ -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
|
||||
|
@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -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,
|
||||
|
@ -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,
|
||||
|
Reference in New Issue
Block a user