sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-11 16:47:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

Reorder file and change naming slightly

Browse Source
This commit is contained in:
Dean Herbert 2020-05-14 14:24:43 +09:00
parent 5e09a1b334
commit fa3373e5f3
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
View File

@ -36,6 +36,9 @@ namespace osu.Game.Overlays.BeatmapListing
private BeatmapListingPager beatmapListingPager; private BeatmapListingPager beatmapListingPager;
private ScheduledDelegate queryChangedDebounce;
private ScheduledDelegate queryPagingDebounce;
public BeatmapListingFilterControl() public BeatmapListingFilterControl()
{ {
RelativeSizeAxes = Axes.X; RelativeSizeAxes = Axes.X;
@ -113,8 +116,17 @@ namespace osu.Game.Overlays.BeatmapListing
sortDirection.BindValueChanged(_ => queueUpdateSearch()); sortDirection.BindValueChanged(_ => queueUpdateSearch());
} }
private ScheduledDelegate queryChangedDebounce; public void TakeFocus() => searchControl.TakeFocus();
private ScheduledDelegate queryPagingDebounce;
public void ShowMore()
{
if (beatmapListingPager == null || !beatmapListingPager.CanFetchNextPage)
return;
if (queryPagingDebounce != null)
return;
beatmapListingPager.FetchNextPage();
}
private void queueUpdateSearch(bool queryTextChanged = false) private void queueUpdateSearch(bool queryTextChanged = false)
{ {
@ -142,7 +154,7 @@ namespace osu.Game.Overlays.BeatmapListing
queryPagingDebounce = null; queryPagingDebounce = null;
beatmapListingPager.PageFetched += onSearchFinished; beatmapListingPager.PageFetched += onSearchFinished;
AddPageToResult(); ShowMore();
} }
private void onSearchFinished(List<BeatmapSetInfo> beatmaps) private void onSearchFinished(List<BeatmapSetInfo> beatmaps)
@ -165,17 +177,5 @@ namespace osu.Game.Overlays.BeatmapListing
base.Dispose(isDisposing); base.Dispose(isDisposing);
} }
public void TakeFocus() => searchControl.TakeFocus();
public void AddPageToResult()
{
if (beatmapListingPager == null || !beatmapListingPager.CanFetchNextPage)
return;
if (queryPagingDebounce != null)
return;
beatmapListingPager.FetchNextPage();
}
} }
} }

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

@ -247,7 +247,7 @@ namespace osu.Game.Overlays
base.Update(); base.Update();
if (shouldAddNextPage) if (shouldAddNextPage)
filterControl.AddPageToResult(); filterControl.ShowMore();
} }
} }
} }