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

Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-listing-expanded

Browse Source
This commit is contained in:
Andrei Zavatski
2020-03-06 01:27:51 +03:00
parent 3c56118f45 aafdfbca1f
commit c08e16d97f
286 changed files with 6276 additions and 2706 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
osu.Game/Overlays/BeatmapListingOverlay.cs
View File

@ -15,6 +15,7 @@ using osu.Game.Audio;
using osu.Game.Beatmaps;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface;
using osu.Game.Online.API.Requests;
using osu.Game.Overlays.BeatmapListing;
using osu.Game.Overlays.Direct;
@ -34,7 +35,6 @@ namespace osu.Game.Overlays
private SearchBeatmapSetsRequest getSetsRequest;
private Container panelsPlaceholder;
private Drawable currentContent;
private BeatmapListingSearchSection searchSection;
private BeatmapListingSortTabControl sortControl;
@ -121,12 +121,21 @@ namespace osu.Game.Overlays
}
}
},
panelsPlaceholder = new Container
new Container
{
AutoSizeAxes = Axes.Y,
RelativeSizeAxes = Axes.X,
Padding = new MarginPadding { Horizontal = 20 },
}
Children = new Drawable[]
{
panelTarget = new Container
{
AutoSizeAxes = Axes.Y,
RelativeSizeAxes = Axes.X,
},
loadingLayer = new LoadingLayer(panelTarget),
}
},
}
}
}
@ -183,6 +192,9 @@ namespace osu.Game.Overlays
private ScheduledDelegate queryChangedDebounce;
private LoadingLayer loadingLayer;
private Container panelTarget;
private void queueUpdateSearch(bool queryTextChanged = false)
{
getSetsRequest?.Cancel();
@ -204,7 +216,7 @@ namespace osu.Game.Overlays
previewTrackManager.StopAnyPlaying(this);
currentContent?.FadeColour(Color4.DimGray, 400, Easing.OutQuint);
loadingLayer.Show();
getSetsRequest = new SearchBeatmapSetsRequest(searchSection.SearchParameters.Value.Query, searchSection.SearchParameters.Value.Ruleset)
{
@ -254,6 +266,8 @@ namespace osu.Game.Overlays
private void addContentToPlaceholder(Drawable content)
{
loadingLayer.Hide();
Drawable lastContent = currentContent;
if (lastContent != null)
@ -267,7 +281,7 @@ namespace osu.Game.Overlays
lastContent.Delay(25).Schedule(() => lastContent.BypassAutoSizeAxes = Axes.Y);
}
panelsPlaceholder.Add(currentContent = content);
panelTarget.Add(currentContent = content);
currentContent.FadeIn(200, Easing.OutQuint);
}