sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-04 21:27:22 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1946 from peppy/better-direct-progress-bar

Browse Source 
Continue showing progress bar on direct panels when importing
This commit is contained in:
Dean Herbert 2018-01-22 15:43:24 +09:00 committed by GitHub
commit 85d1e81a92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Graphics/UserInterface/ProgressBar.cs
View File

@ -18,7 +18,7 @@ namespace osu.Game.Graphics.UserInterface
public Color4 FillColour public Color4 FillColour
{ {
set { fill.Colour = value; } set { fill.FadeColour(value, 150, Easing.OutQuint); }
} }
public Color4 BackgroundColour public Color4 BackgroundColour

5
osu.Game/Overlays/Direct/DirectPanel.cs
View File

@ -65,11 +65,14 @@ namespace osu.Game.Overlays.Direct
Colour = Color4.Black.Opacity(0.3f), Colour = Color4.Black.Opacity(0.3f),
}; };
private OsuColour colours;
[BackgroundDependencyLoader(permitNulls: true)] [BackgroundDependencyLoader(permitNulls: true)]
private void load(BeatmapManager beatmaps, OsuColour colours, BeatmapSetOverlay beatmapSetOverlay) private void load(BeatmapManager beatmaps, OsuColour colours, BeatmapSetOverlay beatmapSetOverlay)
{ {
this.beatmaps = beatmaps; this.beatmaps = beatmaps;
this.beatmapSetOverlay = beatmapSetOverlay; this.beatmapSetOverlay = beatmapSetOverlay;
this.colours = colours;
AddInternal(content = new Container AddInternal(content = new Container
{ {
@ -190,7 +193,7 @@ namespace osu.Game.Overlays.Direct
request.Success += data => request.Success += data =>
{ {
progressBar.Current.Value = 1; progressBar.Current.Value = 1;
progressBar.FadeOut(500); progressBar.FillColour = colours.Yellow;
}; };
} }