sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 08:20:00 +09:00
Code Issues Packages Projects Releases Wiki Activity

Show download progress on card body rather than in button

Browse Source
This commit is contained in:
Bartłomiej Dach
2021-11-10 16:03:48 +01:00
parent f090e5ca75
commit 91baaa73f3
5 changed files with 148 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
osu.Game/Beatmaps/Drawables/Cards/Buttons/DownloadButton.cs
View File

@ -14,8 +14,6 @@ using osu.Game.Graphics;
using osu.Game.Online;
using osu.Game.Overlays;
using osu.Game.Resources.Localisation.Web;
using osu.Game.Screens.Ranking.Expanded.Accuracy;
using osuTK;
namespace osu.Game.Beatmaps.Drawables.Cards.Buttons
{
@ -25,8 +23,6 @@ namespace osu.Game.Beatmaps.Drawables.Cards.Buttons
protected readonly PlayIcon Play;
protected readonly BeatmapDownloadTracker Tracker;
private readonly SmoothCircularProgress downloadProgress;
[Resolved]
private OsuColour colours { get; set; } = null!;
@ -43,13 +39,6 @@ namespace osu.Game.Beatmaps.Drawables.Cards.Buttons
{
Tracker = new BeatmapDownloadTracker(beatmapSet),
Download = new DownloadIcon(beatmapSet),
downloadProgress = new SmoothCircularProgress
{
Size = new Vector2(12),
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
InnerRadius = 0.4f,
},
Play = new PlayIcon(beatmapSet)
};
}
@ -65,12 +54,8 @@ namespace osu.Game.Beatmaps.Drawables.Cards.Buttons
private void updateState()
{
Download.FadeTo(Tracker.State.Value == DownloadState.NotDownloaded ? 1 : 0, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
downloadProgress.FadeTo(Tracker.State.Value == DownloadState.Downloading || Tracker.State.Value == DownloadState.Importing ? 1 : 0, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
downloadProgress.FadeColour(Tracker.State.Value == DownloadState.Importing ? colours.Yellow : colourProvider.Highlight1, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
if (Tracker.State.Value == DownloadState.Downloading)
downloadProgress.FillTo(Tracker.Progress.Value, Tracker.Progress.Value > 0 ? BeatmapCard.TRANSITION_DURATION : 0, Easing.OutQuint);
Download.FadeTo(Tracker.State.Value != DownloadState.LocallyAvailable ? 1 : 0, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
Download.Enabled.Value = Tracker.State.Value == DownloadState.NotDownloaded;
Play.FadeTo(Tracker.State.Value == DownloadState.LocallyAvailable ? 1 : 0, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
}