mirror of
https://github.com/ppy/osu.git
synced 2026-05-19 12:00:05 +08:00
18d4ba5874
Most of this is as everywhere else, but there's also interesting code inspection fixes from the InspectCode bump, so I'll talk about that a little. ## [Fix suspicious equality in `Hotkey`](https://github.com/ppy/osu/commit/948136e49e88a721827d54e51c5759fe9aca811d) Inspection: https://www.jetbrains.com/help/resharper/TypeWithSuspiciousEqualityIsUsedInRecord.Global.html Pretty annoying to fix, nullable array types are a pain. Does look legit though. ## [Fix `StarDifficulty` using inefficient struct equality](https://github.com/ppy/osu/commit/2db775ebb0bb9f18de67677ef84b993465d26545) Inspection: https://www.jetbrains.com/help/resharper/DefaultStructEqualityIsUsed.Global.html This is a dodgy one because there's no real sane way to define equality on `StarDifficulty` now that it has difficulty and performance attributes jammed into it. So I just basically shut the inspection up with a `record` modifier and move on. Unclear where the equality is used precisely. It's from a global inspection. F12 is very unhelpful when trying to track down usages of `Equals()`. We definitely have `Bindable<StarDifficulty>` instances and those do use equality. Maybe more than that. ## [Use `nameof` expressions to reference enum member names](https://github.com/ppy/osu/commit/aa08175c803bc725f3b15a92174dfe6d1b812d91) Inspection: https://www.jetbrains.com/help/resharper/CanSimplifyDictionaryRemovingWithSingleCall.html Pretty quaint. ## [Prefer using concrete values over `default` or `new()`](https://github.com/ppy/osu/commit/b21ee08d7748be10d42268d5c2eb77369026545d) Inspection: https://www.jetbrains.com/help/resharper/PreferConcreteValueOverDefault.html I could see this one going both ways, but I'm kinda sold on this inspection. Explicit is always better. Saves some allocations in the `CancellationToken` cases as well. ## [Explicitly call `.AsEnumerable()` in some realm usages](https://github.com/ppy/osu/commit/c8ce1ecd42b9d8abb8b9e2ab93d471f463e80401) Inspection: https://www.jetbrains.com/help/resharper/PossibleUnintendedQueryableAsEnumerable.html Not fully sold on this one but it's quick and simple so might as well. ## [Simplify dictionary removal with single `.Remove()` call](https://github.com/ppy/osu/commit/5964ceccea900302df726b7a8ecbf6b74eb2e427) Inspection: https://www.jetbrains.com/help/resharper/CanSimplifyDictionaryRemovingWithSingleCall.html Not much to say.
233 lines
8.1 KiB
C#
233 lines
8.1 KiB
C#
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
|
// See the LICENCE file in the repository root for full licence text.
|
|
|
|
#nullable disable
|
|
|
|
using System;
|
|
using System.Collections.Generic;
|
|
using osu.Framework.Allocation;
|
|
using osu.Framework.Audio;
|
|
using osu.Framework.Audio.Sample;
|
|
using osu.Framework.Bindables;
|
|
using osu.Framework.Extensions.Color4Extensions;
|
|
using osu.Framework.Graphics;
|
|
using osu.Framework.Graphics.Containers;
|
|
using osu.Framework.Graphics.Effects;
|
|
using osu.Framework.Graphics.Shapes;
|
|
using osu.Framework.Graphics.Sprites;
|
|
using osu.Framework.Graphics.UserInterface;
|
|
using osu.Framework.Input.Events;
|
|
using osu.Game.Graphics.Containers;
|
|
using osu.Game.Graphics.UserInterface;
|
|
using osu.Game.Resources.Localisation.Web;
|
|
using osuTK;
|
|
using osuTK.Graphics;
|
|
|
|
namespace osu.Game.Overlays
|
|
{
|
|
/// <summary>
|
|
/// <see cref="UserTrackingScrollContainer"/> which provides <see cref="ScrollBackButton"/>. Mostly used in <see cref="FullscreenOverlay{T}"/>.
|
|
/// </summary>
|
|
public partial class OverlayScrollContainer : UserTrackingScrollContainer
|
|
{
|
|
/// <summary>
|
|
/// Scroll position at which the <see cref="ScrollBackButton"/> will be shown.
|
|
/// </summary>
|
|
private const int button_scroll_position = 200;
|
|
|
|
public ScrollBackButton Button { get; private set; }
|
|
|
|
private readonly Bindable<double?> lastScrollTarget = new Bindable<double?>();
|
|
private readonly Bindable<double> progress = new Bindable<double>();
|
|
|
|
[BackgroundDependencyLoader]
|
|
private void load()
|
|
{
|
|
AddInternal(Button = new ScrollBackButton
|
|
{
|
|
Anchor = Anchor.BottomRight,
|
|
Origin = Anchor.BottomRight,
|
|
Margin = new MarginPadding(20),
|
|
Action = scrollBack,
|
|
LastScrollTarget = { BindTarget = lastScrollTarget },
|
|
Progress = { BindTarget = progress },
|
|
});
|
|
}
|
|
|
|
protected override void UpdateAfterChildren()
|
|
{
|
|
base.UpdateAfterChildren();
|
|
|
|
// Map current position to standardized progress
|
|
float height = AvailableContent - DrawHeight;
|
|
progress.Value = height == 0 ? 1 : Math.Round(Math.Clamp(Current / height, 0, 1), 3);
|
|
|
|
if (ScrollContent.DrawHeight + button_scroll_position < DrawHeight)
|
|
{
|
|
Button.State = Visibility.Hidden;
|
|
return;
|
|
}
|
|
|
|
Button.State = Target > button_scroll_position || lastScrollTarget.Value != null ? Visibility.Visible : Visibility.Hidden;
|
|
}
|
|
|
|
protected override void OnUserScroll(double value, bool animated = true, double? distanceDecay = null)
|
|
{
|
|
base.OnUserScroll(value, animated, distanceDecay);
|
|
|
|
lastScrollTarget.Value = null;
|
|
}
|
|
|
|
private void scrollBack()
|
|
{
|
|
if (lastScrollTarget.Value == null)
|
|
{
|
|
lastScrollTarget.Value = Target;
|
|
ScrollToStart();
|
|
}
|
|
else
|
|
{
|
|
ScrollTo(lastScrollTarget.Value.Value);
|
|
lastScrollTarget.Value = null;
|
|
}
|
|
}
|
|
|
|
public partial class ScrollBackButton : OsuHoverContainer
|
|
{
|
|
private const int fade_duration = 500;
|
|
|
|
private Visibility state;
|
|
|
|
public Visibility State
|
|
{
|
|
get => state;
|
|
set
|
|
{
|
|
if (value == state)
|
|
return;
|
|
|
|
state = value;
|
|
Enabled.Value = state == Visibility.Visible;
|
|
this.FadeTo(state == Visibility.Visible ? 1 : 0, fade_duration, Easing.OutQuint);
|
|
}
|
|
}
|
|
|
|
protected override IEnumerable<Drawable> EffectTargets => new[] { background };
|
|
|
|
private Color4 flashColour;
|
|
|
|
private readonly Container content;
|
|
private readonly Box background;
|
|
private readonly CircularProgress currentCircularProgress;
|
|
private readonly SpriteIcon spriteIcon;
|
|
|
|
public Bindable<double?> LastScrollTarget = new Bindable<double?>();
|
|
public Bindable<double> Progress = new Bindable<double>();
|
|
|
|
protected override HoverSounds CreateHoverSounds(HoverSampleSet sampleSet) => new HoverSounds();
|
|
|
|
private Sample scrollToTopSample;
|
|
private Sample scrollToPreviousSample;
|
|
|
|
public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => content.ReceivePositionalInputAt(screenSpacePos);
|
|
|
|
public ScrollBackButton()
|
|
{
|
|
Size = new Vector2(50);
|
|
Alpha = 0;
|
|
|
|
Add(content = new CircularContainer
|
|
{
|
|
RelativeSizeAxes = Axes.Both,
|
|
Anchor = Anchor.Centre,
|
|
Origin = Anchor.Centre,
|
|
Masking = true,
|
|
EdgeEffect = new EdgeEffectParameters
|
|
{
|
|
Type = EdgeEffectType.Shadow,
|
|
Offset = new Vector2(0f, 1f),
|
|
Radius = 3f,
|
|
Colour = Color4.Black.Opacity(0.25f),
|
|
},
|
|
Children = new Drawable[]
|
|
{
|
|
background = new Box
|
|
{
|
|
RelativeSizeAxes = Axes.Both
|
|
},
|
|
currentCircularProgress = new CircularProgress
|
|
{
|
|
RelativeSizeAxes = Axes.Both,
|
|
InnerRadius = 0.1f,
|
|
},
|
|
spriteIcon = new SpriteIcon
|
|
{
|
|
Anchor = Anchor.Centre,
|
|
Origin = Anchor.Centre,
|
|
Size = new Vector2(15),
|
|
Icon = FontAwesome.Solid.ChevronUp
|
|
}
|
|
}
|
|
});
|
|
|
|
TooltipText = CommonStrings.ButtonsBackToTop;
|
|
}
|
|
|
|
[BackgroundDependencyLoader]
|
|
private void load(OverlayColourProvider colourProvider, AudioManager audio)
|
|
{
|
|
IdleColour = colourProvider.Background6;
|
|
HoverColour = colourProvider.Background5;
|
|
flashColour = colourProvider.Light1;
|
|
currentCircularProgress.Colour = colourProvider.Highlight1;
|
|
|
|
scrollToTopSample = audio.Samples.Get(@"UI/scroll-to-top");
|
|
scrollToPreviousSample = audio.Samples.Get(@"UI/scroll-to-previous");
|
|
}
|
|
|
|
protected override void LoadComplete()
|
|
{
|
|
base.LoadComplete();
|
|
|
|
Progress.BindValueChanged(p => currentCircularProgress.Progress = p.NewValue, true);
|
|
|
|
LastScrollTarget.BindValueChanged(target =>
|
|
{
|
|
spriteIcon.ScaleTo(target.NewValue != null ? new Vector2(1f, -1f) : Vector2.One, fade_duration, Easing.OutQuint);
|
|
TooltipText = target.NewValue != null ? CommonStrings.ButtonsBackToPrevious : CommonStrings.ButtonsBackToTop;
|
|
}, true);
|
|
}
|
|
|
|
protected override bool OnClick(ClickEvent e)
|
|
{
|
|
background.FlashColour(flashColour, 800, Easing.OutQuint);
|
|
|
|
if (LastScrollTarget.Value == null)
|
|
scrollToTopSample?.Play();
|
|
else
|
|
scrollToPreviousSample?.Play();
|
|
|
|
return base.OnClick(e);
|
|
}
|
|
|
|
protected override bool OnMouseDown(MouseDownEvent e)
|
|
{
|
|
content.ScaleTo(0.75f, 2000, Easing.OutQuint);
|
|
return true;
|
|
}
|
|
|
|
protected override void OnMouseUp(MouseUpEvent e)
|
|
{
|
|
content.ScaleTo(1, 1000, Easing.OutElastic);
|
|
base.OnMouseUp(e);
|
|
}
|
|
|
|
protected override bool OnHover(HoverEvent e)
|
|
{
|
|
base.OnHover(e);
|
|
return true;
|
|
}
|
|
}
|
|
}
|
|
}
|