RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use IBindable where possible

This commit is contained in:
Dean Herbert 2018-06-29 20:28:28 +09:00
parent 9fce4eaccf
commit 06bd3d4815
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
osu.Game/Screens/Select/FilterControl.cs
View File

@ -62,7 +62,7 @@ public GroupMode Group
Sort = sort,
SearchText = searchTextBox.Text,
AllowConvertedBeatmaps = showConverted,
Ruleset = ruleset
Ruleset = ruleset.Value
};
public Action Exit;
@ -163,14 +163,14 @@ public void Activate()
searchTextBox.HoldFocus = true;
}
private readonly Bindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
private readonly IBindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
private Bindable<bool> showConverted;
public readonly Box Background;
[BackgroundDependencyLoader(permitNulls: true)]
private void load(OsuColour colours, Bindable<RulesetInfo> parentRuleset, OsuConfigManager config)
private void load(OsuColour colours, IBindable<RulesetInfo> parentRuleset, OsuConfigManager config)
{
sortTabs.AccentColour = colours.GreenLight;
@ -179,8 +179,7 @@ private void load(OsuColour colours, Bindable<RulesetInfo> parentRuleset, OsuCon
if (parentRuleset != null)
ruleset.BindTo(parentRuleset);
ruleset.ValueChanged += val => updateCriteria();
ruleset.TriggerChange();
ruleset.BindValueChanged(val => updateCriteria(), true);
}
private void updateCriteria() => FilterChanged?.Invoke(CreateCriteria());

4
osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
View File

@ -32,7 +32,7 @@ public class Leaderboard : Container
private FillFlowContainer<LeaderboardScore> scrollFlow;
private readonly Bindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
private readonly IBindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
public Action<Score> ScoreSelected;
@ -192,7 +192,7 @@ public BeatmapInfo Beatmap
}
[BackgroundDependencyLoader(permitNulls: true)]
private void load(APIAccess api, Bindable<RulesetInfo> parentRuleset)
private void load(APIAccess api, IBindable<RulesetInfo> parentRuleset)
{
this.api = api;