mirror of https://github.com/ppy/osu
Rename KeyCounterCollection -> KeyCounterDisplay
Also fix not working
This commit is contained in:
parent
e512d88899
commit
8658de5108
|
@ -20,13 +20,13 @@ public class TestCaseKeyCounter : ManualInputManagerTestCase
|
|||
{
|
||||
typeof(KeyCounterKeyboard),
|
||||
typeof(KeyCounterMouse),
|
||||
typeof(KeyCounterCollection)
|
||||
typeof(KeyCounterDisplay)
|
||||
};
|
||||
|
||||
public TestCaseKeyCounter()
|
||||
{
|
||||
KeyCounterKeyboard rewindTestKeyCounterKeyboard;
|
||||
KeyCounterCollection kc = new KeyCounterCollection
|
||||
KeyCounterDisplay kc = new KeyCounterDisplay
|
||||
{
|
||||
Origin = Anchor.Centre,
|
||||
Anchor = Anchor.Centre,
|
||||
|
|
|
@ -211,7 +211,7 @@ public override void SetReplayScore(Score replayScore)
|
|||
/// <returns>The DrawableHitObject.</returns>
|
||||
public abstract DrawableHitObject<TObject> GetVisualRepresentation(TObject h);
|
||||
|
||||
public void Attach(KeyCounterCollection keyCounter) =>
|
||||
public void Attach(KeyCounterDisplay keyCounter) =>
|
||||
(KeyBindingInputManager as ICanAttachKeyCounter)?.Attach(keyCounter);
|
||||
|
||||
/// <summary>
|
||||
|
|
|
@ -34,11 +34,15 @@ protected override InputState CreateInitialState()
|
|||
|
||||
protected readonly KeyBindingContainer<T> KeyBindingContainer;
|
||||
|
||||
protected override Container<Drawable> Content => KeyBindingContainer;
|
||||
protected override Container<Drawable> Content => content;
|
||||
|
||||
private readonly Container content;
|
||||
|
||||
protected RulesetInputManager(RulesetInfo ruleset, int variant, SimultaneousBindingMode unique)
|
||||
{
|
||||
InternalChild = KeyBindingContainer = CreateKeyBindingContainer(ruleset, variant, unique);
|
||||
InternalChild = KeyBindingContainer =
|
||||
(KeyBindingContainer<T>)CreateKeyBindingContainer(ruleset, variant, unique)
|
||||
.WithChild(content = new Container { RelativeSizeAxes = Axes.Both });
|
||||
}
|
||||
|
||||
[BackgroundDependencyLoader(true)]
|
||||
|
@ -115,18 +119,19 @@ protected override bool Handle(UIEvent e)
|
|||
|
||||
#region Key Counter Attachment
|
||||
|
||||
public void Attach(KeyCounterCollection keyCounter)
|
||||
public void Attach(KeyCounterDisplay keyCounter)
|
||||
{
|
||||
var receptor = new ActionReceptor(keyCounter);
|
||||
Add(receptor);
|
||||
keyCounter.SetReceptor(receptor);
|
||||
|
||||
KeyBindingContainer.Add(receptor);
|
||||
|
||||
keyCounter.SetReceptor(receptor);
|
||||
keyCounter.AddRange(KeyBindingContainer.DefaultKeyBindings.Select(b => b.GetAction<T>()).Distinct().Select(b => new KeyCounterAction<T>(b)));
|
||||
}
|
||||
|
||||
public class ActionReceptor : KeyCounterCollection.Receptor, IKeyBindingHandler<T>
|
||||
public class ActionReceptor : KeyCounterDisplay.Receptor, IKeyBindingHandler<T>
|
||||
{
|
||||
public ActionReceptor(KeyCounterCollection target)
|
||||
public ActionReceptor(KeyCounterDisplay target)
|
||||
: base(target)
|
||||
{
|
||||
}
|
||||
|
@ -159,12 +164,12 @@ public interface IHasReplayHandler
|
|||
}
|
||||
|
||||
/// <summary>
|
||||
/// Supports attaching a <see cref="KeyCounterCollection"/>.
|
||||
/// Supports attaching a <see cref="KeyCounterDisplay"/>.
|
||||
/// Keys will be populated automatically and a receptor will be injected inside.
|
||||
/// </summary>
|
||||
public interface ICanAttachKeyCounter
|
||||
{
|
||||
void Attach(KeyCounterCollection keyCounter);
|
||||
void Attach(KeyCounterDisplay keyCounter);
|
||||
}
|
||||
|
||||
public class RulesetInputManagerInputState<T> : InputState
|
||||
|
|
|
@ -24,7 +24,7 @@ public class HUDOverlay : Container
|
|||
{
|
||||
private const int duration = 100;
|
||||
|
||||
public readonly KeyCounterCollection KeyCounter;
|
||||
public readonly KeyCounterDisplay KeyCounter;
|
||||
public readonly RollingCounter<int> ComboCounter;
|
||||
public readonly ScoreCounter ScoreCounter;
|
||||
public readonly RollingCounter<double> AccuracyCounter;
|
||||
|
@ -201,7 +201,7 @@ protected override bool OnKeyDown(KeyDownEvent e)
|
|||
Margin = new MarginPadding { Top = 20 }
|
||||
};
|
||||
|
||||
protected virtual KeyCounterCollection CreateKeyCounter() => new KeyCounterCollection
|
||||
protected virtual KeyCounterDisplay CreateKeyCounter() => new KeyCounterDisplay
|
||||
{
|
||||
FadeTime = 50,
|
||||
Anchor = Anchor.BottomRight,
|
||||
|
|
|
@ -14,14 +14,14 @@
|
|||
|
||||
namespace osu.Game.Screens.Play
|
||||
{
|
||||
public class KeyCounterCollection : FillFlowContainer<KeyCounter>
|
||||
public class KeyCounterDisplay : FillFlowContainer<KeyCounter>
|
||||
{
|
||||
private const int duration = 100;
|
||||
|
||||
public readonly Bindable<bool> Visible = new Bindable<bool>(true);
|
||||
private readonly Bindable<bool> configVisibility = new Bindable<bool>();
|
||||
|
||||
public KeyCounterCollection()
|
||||
public KeyCounterDisplay()
|
||||
{
|
||||
Direction = FillDirection.Horizontal;
|
||||
AutoSizeAxes = Axes.Both;
|
||||
|
@ -138,9 +138,9 @@ public void SetReceptor(Receptor receptor)
|
|||
|
||||
public class Receptor : Drawable
|
||||
{
|
||||
protected readonly KeyCounterCollection Target;
|
||||
protected readonly KeyCounterDisplay Target;
|
||||
|
||||
public Receptor(KeyCounterCollection target)
|
||||
public Receptor(KeyCounterDisplay target)
|
||||
{
|
||||
RelativeSizeAxes = Axes.Both;
|
||||
Depth = float.MinValue;
|
Loading…
Reference in New Issue