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

Don't use CancelDelayedTasks to avoid cancelling unwanted tasks

Browse Source
This commit is contained in:
Andrei Zavatski 2019-09-06 22:56:46 +03:00
parent 157502339e
commit 3227dc87fb
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game/Overlays/SocialOverlay.cs
View File

@ -17,6 +17,7 @@ using osu.Game.Overlays.Social;
using osu.Game.Users; using osu.Game.Users;
using System; using System;
using System.Threading; using System.Threading;
using osu.Framework.Threading;
namespace osu.Game.Overlays namespace osu.Game.Overlays
{ {
@ -77,12 +78,12 @@ namespace osu.Game.Overlays
currentQuery.BindTo(Filter.Search.Current); currentQuery.BindTo(Filter.Search.Current);
currentQuery.ValueChanged += query => currentQuery.ValueChanged += query =>
{ {
Scheduler.CancelDelayedTasks(); queryChangedDebounce?.Cancel();
if (string.IsNullOrEmpty(query.NewValue)) if (string.IsNullOrEmpty(query.NewValue))
queueUpdate(); queueUpdate();
else else
Scheduler.AddDelayed(updateSearch, 500); queryChangedDebounce = Scheduler.AddDelayed(updateSearch, 500);
}; };
} }
@ -90,13 +91,15 @@ namespace osu.Game.Overlays
private readonly Bindable<string> currentQuery = new Bindable<string>(); private readonly Bindable<string> currentQuery = new Bindable<string>();
private ScheduledDelegate queryChangedDebounce;
private void queueUpdate() => Scheduler.AddOnce(updateSearch); private void queueUpdate() => Scheduler.AddOnce(updateSearch);
private CancellationTokenSource loadCancellation; private CancellationTokenSource loadCancellation;
private void updateSearch() private void updateSearch()
{ {
Scheduler.CancelDelayedTasks(); queryChangedDebounce?.Cancel();
if (!IsLoaded) if (!IsLoaded)
return; return;
@ -169,6 +172,9 @@ namespace osu.Game.Overlays
LoadComponentAsync(newPanels, f => LoadComponentAsync(newPanels, f =>
{ {
if (panels != null)
ScrollFlow.Remove(panels);
loading.Hide(); loading.Hide();
ScrollFlow.Add(panels = newPanels); ScrollFlow.Add(panels = newPanels);
}, loadCancellation.Token); }, loadCancellation.Token);