Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix hit error displays not clearing on seek #25747

Merged
merged 3 commits into from
Dec 13, 2023
Merged

Fix hit error displays not clearing on seek #25747

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1107492
Cache `GameplayClockContainer` to allow usage of `OnSeek`
peppy Dec 13, 2023
f2c6c34
Fix `HitError` `Clear` methods not correctly returning pooled drawables
peppy Dec 13, 2023
3131d37
Clear transformations with more fire
peppy Dec 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions osu.Game/Screens/Play/GameplayClockContainer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ namespace osu.Game.Screens.Play
/// Encapsulates gameplay timing logic and provides a <see cref="IGameplayClock"/> via DI for gameplay components to use.
/// </summary>
[Cached(typeof(IGameplayClock))]
[Cached(typeof(GameplayClockContainer))]
smoogipoo marked this conversation as resolved.
Show resolved Hide resolved
public partial class GameplayClockContainer : Container, IAdjustableClock, IGameplayClock
{
public IBindable<bool> IsPaused => isPaused;
Expand Down
6 changes: 5 additions & 1 deletion osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,11 @@ protected override void PrepareForUse()
}
}

public override void Clear() => judgementsContainer.Clear();
public override void Clear()
{
foreach (var j in judgementsContainer)
j.FadeOut().Expire();
}

public enum CentreMarkerStyles
{
Expand Down
6 changes: 5 additions & 1 deletion osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,11 @@ protected override void OnNewJudgement(JudgementResult judgement)
judgementsFlow.Push(GetColourForHitResult(judgement.Type));
}

public override void Clear() => judgementsFlow.Clear();
public override void Clear()
{
foreach (var j in judgementsFlow)
j.FadeOut().Expire();
}

private partial class JudgementFlow : FillFlowContainer<HitErrorShape>
{
Expand Down