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

Internalise bindable and progress handling to ensure transforms don't go backwards

Browse Source
This commit is contained in:
Dean Herbert
2022-04-28 18:26:29 +09:00
parent 9f6597695c
commit 4e0d70cbf4
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
osu.Game/Overlays/FirstRunSetup/ScreenBeatmaps.cs
View File

@ -5,7 +5,6 @@
using System.ComponentModel; using System.ComponentModel;
using System.Linq; using System.Linq;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Game.Beatmaps.Drawables; using osu.Game.Beatmaps.Drawables;
using osu.Game.Database; using osu.Game.Database;
@ -129,7 +128,7 @@ namespace osu.Game.Overlays.FirstRunSetup
downloadTracker.Progress.BindValueChanged(progress => downloadTracker.Progress.BindValueChanged(progress =>
{ {
downloadTutorialButton.Current.Value = progress.NewValue; downloadTutorialButton.SetProgress(progress.NewValue, false);
if (progress.NewValue == 1) if (progress.NewValue == 1)
downloadTutorialButton.Complete(); downloadTutorialButton.Complete();
@ -152,10 +151,10 @@ namespace osu.Game.Overlays.FirstRunSetup
{ {
double progress = (double)bundledDownloader.DownloadTrackers.Count(t => t.State.Value == DownloadState.LocallyAvailable) / bundledDownloader.DownloadTrackers.Count(); double progress = (double)bundledDownloader.DownloadTrackers.Count(t => t.State.Value == DownloadState.LocallyAvailable) / bundledDownloader.DownloadTrackers.Count();
this.TransformBindableTo(downloadBundledButton.Current, progress, 2000, Easing.OutQuint);
if (progress == 1) if (progress == 1)
downloadBundledButton.Complete(); downloadBundledButton.Complete();
else
downloadBundledButton.SetProgress(progress, true);
} }
} }
@ -166,8 +165,6 @@ namespace osu.Game.Overlays.FirstRunSetup
private ProgressBar progressBar = null!; private ProgressBar progressBar = null!;
public Bindable<double> Current => progressBar.Current;
protected override void LoadComplete() protected override void LoadComplete()
{ {
base.LoadComplete(); base.LoadComplete();
@ -189,7 +186,15 @@ namespace osu.Game.Overlays.FirstRunSetup
Background.FadeColour(colours.Green, 500, Easing.OutQuint); Background.FadeColour(colours.Green, 500, Easing.OutQuint);
progressBar.FillColour = colours.Green; progressBar.FillColour = colours.Green;
this.TransformBindableTo(Current, 1, 500, Easing.OutQuint); this.TransformBindableTo(progressBar.Current, 1, 500, Easing.OutQuint);
}
public void SetProgress(double progress, bool animated)
{
if (!Enabled.Value)
return;
this.TransformBindableTo(progressBar.Current, progress, animated ? 500 : 0, Easing.OutQuint);
} }
} }
} }