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

Use bindable flow to avoid scheduled updates

Browse Source
This commit is contained in:
Dean Herbert
2019-06-14 19:16:20 +09:00
parent eb86d43d19
commit ef21a9e1d2
7 changed files with 111 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchPairing.cs
View File

@ -1,6 +1,8 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using System;
using System.Collections.Generic;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
@ -73,26 +75,56 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
}
};
pairing.Team1.BindValueChanged(_ => updateTeams());
pairing.Team2.BindValueChanged(_ => updateTeams());
pairing.Team1Score.BindValueChanged(_ => updateWinConditions());
pairing.Team2Score.BindValueChanged(_ => updateWinConditions());
pairing.Grouping.BindValueChanged(_ => updateWinConditions());
pairing.Completed.BindValueChanged(_ => updateProgression());
pairing.Progression.BindValueChanged(_ => updateProgression());
pairing.LosersProgression.BindValueChanged(_ => updateProgression());
pairing.Losers.BindValueChanged(_ => updateTeams());
pairing.Current.BindValueChanged(_ => updateCurrentMatch(), true);
pairing.Position.BindValueChanged(pos =>
boundReference(pairing.Team1).BindValueChanged(_ => updateTeams());
boundReference(pairing.Team2).BindValueChanged(_ => updateTeams());
boundReference(pairing.Team1Score).BindValueChanged(_ => updateWinConditions());
boundReference(pairing.Team2Score).BindValueChanged(_ => updateWinConditions());
boundReference(pairing.Grouping).BindValueChanged(_ =>
{
if (IsDragged) return;
Position = new Vector2(pos.NewValue.X, pos.NewValue.Y);
updateWinConditions();
Changed?.Invoke();
});
boundReference(pairing.Completed).BindValueChanged(_ => updateProgression());
boundReference(pairing.Progression).BindValueChanged(_ => updateProgression());
boundReference(pairing.LosersProgression).BindValueChanged(_ => updateProgression());
boundReference(pairing.Losers).BindValueChanged(_ =>
{
updateTeams();
Changed?.Invoke();
});
boundReference(pairing.Current).BindValueChanged(_ => updateCurrentMatch(), true);
boundReference(pairing.Position).BindValueChanged(pos =>
{
if (!IsDragged)
Position = new Vector2(pos.NewValue.X, pos.NewValue.Y);
Changed?.Invoke();
}, true);
updateTeams();
}
/// <summary>
/// Fired when somethign changed that requires a ladder redraw.
/// </summary>
public Action Changed;
private readonly List<IUnbindable> refBindables = new List<IUnbindable>();
private T boundReference<T>(T obj)
where T : IBindable
{
obj = (T)obj.GetBoundCopy();
refBindables.Add(obj);
return obj;
}
protected override void Dispose(bool isDisposing)
{
base.Dispose(isDisposing);
foreach (var b in refBindables)
b.UnbindAll();
}
private void updateCurrentMatch()
{
if (Pairing.Current.Value)
@ -149,6 +181,8 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
transferProgression(Pairing.Progression?.Value, Pairing.Winner);
transferProgression(Pairing.LosersProgression?.Value, Pairing.Loser);
}
Changed?.Invoke();
}
private void transferProgression(MatchPairing destination, TournamentTeam team)
@ -273,7 +307,7 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
Pairing.Progression.Value = null;
Pairing.LosersProgression.Value = null;
Expire();
ladderInfo.Pairings.Remove(Pairing);
}
}
}

5
osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs
View File

@ -2,6 +2,7 @@
// See the LICENCE file in the repository root for full licence text.
using System;
using System.Collections.Generic;
using System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
@ -88,7 +89,7 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
}
};
var groupingOptions = ladderInfo.Groupings.Prepend(new TournamentGrouping());
IEnumerable<TournamentGrouping> groupingOptions = null;
void updateDropdownItems()
{
@ -99,6 +100,8 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
ladderInfo.Groupings.ItemsRemoved += _ => updateDropdownItems();
ladderInfo.Groupings.ItemsAdded += _ => updateDropdownItems();
updateDropdownItems();
editorInfo.Selected.ValueChanged += selection =>
{
textboxTeam1.Text = selection.NewValue?.Team1.Value?.Acronym;

1
osu.Game.Tournament/Screens/Ladder/Components/TournamentGrouping.cs
View File

@ -21,6 +21,7 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
public readonly Bindable<DateTimeOffset> StartDate = new Bindable<DateTimeOffset>();
// only used for serialisation
public List<int> Pairings = new List<int>();
public override string ToString() => Name.Value ?? "None";