h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-14 17:52:56 +08:00
Code Issues Releases Wiki Activity

Merge pull request #25411 from peppy/fix-key-counter-sizing-woes

Browse Source 
Refactor `KeyCounterDisplay` to use autosize
This commit is contained in:
Bartłomiej Dach 2023-11-12 20:47:55 +09:00 committed by GitHub
commit bb2f38d189
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game/Screens/Play/ArgonKeyCounterDisplay.cs
View File

@ -10,8 +10,6 @@ namespace osu.Game.Screens.Play
{
public partial class ArgonKeyCounterDisplay : KeyCounterDisplay
{
private const int duration = 100;
protected override FillFlowContainer<KeyCounter> KeyFlow { get; }
public ArgonKeyCounterDisplay()
@ -25,16 +23,6 @@ namespace osu.Game.Screens.Play
};
}
protected override void Update()
{
base.Update();
Size = KeyFlow.Size;
}
protected override KeyCounter CreateCounter(InputTrigger trigger) => new ArgonKeyCounter(trigger);
protected override void UpdateVisibility()
=> KeyFlow.FadeTo(AlwaysVisible.Value || ConfigVisibility.Value ? 1 : 0, duration);
}
}

14
osu.Game/Screens/Play/HUD/DefaultKeyCounterDisplay.cs
View File

@ -10,7 +10,6 @@ namespace osu.Game.Screens.Play.HUD
{
public partial class DefaultKeyCounterDisplay : KeyCounterDisplay
{
private const int duration = 100;
private const double key_fade_time = 80;
protected override FillFlowContainer<KeyCounter> KeyFlow { get; }
@ -25,15 +24,6 @@ namespace osu.Game.Screens.Play.HUD
};
}
protected override void Update()
{
base.Update();
// Don't use autosize as it will shrink to zero when KeyFlow is hidden.
// In turn this can cause the display to be masked off screen and never become visible again.
Size = KeyFlow.Size;
}
protected override KeyCounter CreateCounter(InputTrigger trigger) => new DefaultKeyCounter(trigger)
{
FadeTime = key_fade_time,
@ -41,10 +31,6 @@ namespace osu.Game.Screens.Play.HUD
KeyUpTextColor = KeyUpTextColor,
};
protected override void UpdateVisibility() =>
// Isolate changing visibility of the key counters from fading this component.
KeyFlow.FadeTo(AlwaysVisible.Value || ConfigVisibility.Value ? 1 : 0, duration);
private Color4 keyDownTextColor = Color4.DarkGray;
public Color4 KeyDownTextColor

17
osu.Game/Screens/Play/HUD/KeyCounterDisplay.cs
View File

@ -4,6 +4,7 @@
using System.Collections.Specialized;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Configuration;
using osu.Game.Rulesets.UI;
@ -31,13 +32,27 @@ namespace osu.Game.Screens.Play.HUD
[Resolved]
private InputCountController controller { get; set; } = null!;
protected abstract void UpdateVisibility();
private const int duration = 100;
protected void UpdateVisibility()
{
bool visible = AlwaysVisible.Value || ConfigVisibility.Value;
// Isolate changing visibility of the key counters from fading this component.
KeyFlow.FadeTo(visible ? 1 : 0, duration);
// Ensure a valid size is immediately obtained even if partially off-screen
// See https://github.com/ppy/osu/issues/14793.
KeyFlow.AlwaysPresent = visible;
}
protected abstract KeyCounter CreateCounter(InputTrigger trigger);
[BackgroundDependencyLoader]
private void load(OsuConfigManager config, DrawableRuleset? drawableRuleset)
{
AutoSizeAxes = Axes.Both;
config.BindWith(OsuSetting.KeyOverlay, ConfigVisibility);
if (drawableRuleset != null)