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

Move TriggerChange to LoadComplete()

This commit is contained in:
smoogipoo 2018-01-17 21:52:57 +09:00
parent 379688e2f2
commit c79603290d
2 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
osu.Game/Screens/Play/HUDOverlay.cs
View File

@ -60,23 +60,6 @@ public HUDOverlay()
}
});
replayLoaded.ValueChanged += replayLoadedValueChanged;
}
private void replayLoadedValueChanged(bool loaded)
{
ReplaySettingsOverlay.ReplayLoaded = loaded;
if (loaded)
{
ReplaySettingsOverlay.Show();
ModDisplay.FadeIn(200);
}
else
{
ReplaySettingsOverlay.Hide();
ModDisplay.Delay(2000).FadeOut(200);
}
}
[BackgroundDependencyLoader(true)]
@ -109,12 +92,35 @@ private void load(OsuConfigManager config, NotificationOverlay notificationOverl
}
}
protected override void LoadComplete()
{
base.LoadComplete();
replayLoaded.ValueChanged += replayLoadedValueChanged;
replayLoaded.TriggerChange();
}
private void replayLoadedValueChanged(bool loaded)
{
ReplaySettingsOverlay.ReplayLoaded = loaded;
if (loaded)
{
ReplaySettingsOverlay.Show();
ModDisplay.FadeIn(200);
}
else
{
ReplaySettingsOverlay.Hide();
ModDisplay.Delay(2000).FadeOut(200);
}
}
public virtual void BindRulesetContainer(RulesetContainer rulesetContainer)
{
(rulesetContainer.KeyBindingInputManager as ICanAttachKeyCounter)?.Attach(KeyCounter);
replayLoaded.BindTo(rulesetContainer.HasReplayLoaded);
replayLoaded.TriggerChange();
Progress.BindRulestContainer(rulesetContainer);
}

4
osu.Game/Screens/Play/SongProgress.cs
View File

@ -105,12 +105,14 @@ public SongProgress()
protected override void LoadComplete()
{
State = Visibility.Visible;
replayLoaded.ValueChanged += v => AllowSeeking = v;
replayLoaded.TriggerChange();
}
public void BindRulestContainer(RulesetContainer rulesetContainer)
{
replayLoaded.BindTo(rulesetContainer.HasReplayLoaded);
replayLoaded.TriggerChange();
}
private bool allowSeeking;