h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 11:37:28 +08:00
Code Issues Releases Wiki Activity

Rename KeyCounterCollection -> KeyCounterDisplay

Browse Source 
Also fix not working
This commit is contained in:
Dean Herbert 2019-03-26 11:28:43 +09:00
parent 82140c38fc
commit b75ea295db
5 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Tests/Visual/TestCaseKeyCounter.cs
View File

@ -20,13 +20,13 @@ namespace osu.Game.Tests.Visual
{
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,

2
osu.Game/Rulesets/UI/DrawableRuleset.cs
View File

@ -232,7 +232,7 @@ namespace osu.Game.Rulesets.UI
/// <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>

28
osu.Game/Rulesets/UI/RulesetInputManager.cs
View File

@ -6,6 +6,7 @@ using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Input;
using osu.Framework.Input.Bindings;
using osu.Framework.Input.Events;
@ -34,11 +35,19 @@ namespace osu.Game.Rulesets.UI
protected readonly KeyBindingContainer<T> KeyBindingContainer;
protected override Container<Drawable> Content => KeyBindingContainer;
protected override Container<Drawable> Content => content;
private readonly Container content;
private class Poop : Container<Box>
{
}
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 +124,19 @@ namespace osu.Game.Rulesets.UI
#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 +169,12 @@ namespace osu.Game.Rulesets.UI
}
/// <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

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

@ -24,7 +24,7 @@ namespace osu.Game.Screens.Play
{
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 @@ namespace osu.Game.Screens.Play
Margin = new MarginPadding { Top = 20 }
};
protected virtual KeyCounterCollection CreateKeyCounter() => new KeyCounterCollection
protected virtual KeyCounterDisplay CreateKeyCounter() => new KeyCounterDisplay
{
FadeTime = 50,
Anchor = Anchor.BottomRight,

8
osu.Game/Screens/Play/KeyCounterCollection.cs → osu.Game/Screens/Play/KeyCounterDisplay.cs
View File

@ -14,14 +14,14 @@ using osuTK.Graphics;
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 @@ namespace osu.Game.Screens.Play
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;