sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 00:09:55 +09:00
Code Issues Packages Projects Releases Wiki Activity

Rename Add/AddRange methods as they are no longer conflicting with Container

Browse Source
This commit is contained in:
Dean Herbert
2023-03-15 18:02:41 +09:00
parent 9e444af380
commit 5f9b13a775
7 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
View File

@ -266,7 +266,7 @@ namespace osu.Game.Tests.Visual.Gameplay
hudOverlay = new HUDOverlay(null, Array.Empty<Mod>()); hudOverlay = new HUDOverlay(null, Array.Empty<Mod>());
// Add any key just to display the key counter visually. // Add any key just to display the key counter visually.
hudOverlay.KeyCounter.AddTrigger(new KeyCounterKeyboardTrigger(Key.Space)); hudOverlay.KeyCounter.Add(new KeyCounterKeyboardTrigger(Key.Space));
scoreProcessor.Combo.Value = 1; scoreProcessor.Combo.Value = 1;

4
osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
View File

@ -23,7 +23,7 @@ namespace osu.Game.Tests.Visual.Gameplay
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
}; };
kc.AddTriggerRange(new InputTrigger[] kc.AddRange(new InputTrigger[]
{ {
new KeyCounterKeyboardTrigger(Key.X), new KeyCounterKeyboardTrigger(Key.X),
new KeyCounterKeyboardTrigger(Key.X), new KeyCounterKeyboardTrigger(Key.X),
@ -36,7 +36,7 @@ namespace osu.Game.Tests.Visual.Gameplay
AddStep("Add random", () => AddStep("Add random", () =>
{ {
Key key = (Key)((int)Key.A + RNG.Next(26)); Key key = (Key)((int)Key.A + RNG.Next(26));
kc.AddTrigger(new KeyCounterKeyboardTrigger(key)); kc.Add(new KeyCounterKeyboardTrigger(key));
}); });
Key testKey = ((KeyCounterKeyboardTrigger)kc.Counters.First().Trigger).Key; Key testKey = ((KeyCounterKeyboardTrigger)kc.Counters.First().Trigger).Key;

2
osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
View File

@ -58,7 +58,7 @@ namespace osu.Game.Tests.Visual.Gameplay
}; };
// Add any key just to display the key counter visually. // Add any key just to display the key counter visually.
hudOverlay.KeyCounter.AddTrigger(new KeyCounterKeyboardTrigger(Key.Space)); hudOverlay.KeyCounter.Add(new KeyCounterKeyboardTrigger(Key.Space));
scoreProcessor.Combo.Value = 1; scoreProcessor.Combo.Value = 1;
return new Container return new Container

2
osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
View File

@ -87,7 +87,7 @@ namespace osu.Game.Tests.Visual.Gameplay
hudOverlay = new HUDOverlay(null, Array.Empty<Mod>()); hudOverlay = new HUDOverlay(null, Array.Empty<Mod>());
// Add any key just to display the key counter visually. // Add any key just to display the key counter visually.
hudOverlay.KeyCounter.AddTrigger(new KeyCounterKeyboardTrigger(Key.Space)); hudOverlay.KeyCounter.Add(new KeyCounterKeyboardTrigger(Key.Space));
action?.Invoke(hudOverlay); action?.Invoke(hudOverlay);

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

@ -162,7 +162,7 @@ namespace osu.Game.Rulesets.UI
KeyBindingContainer.Add(receptor); KeyBindingContainer.Add(receptor);
keyCounter.SetReceptor(receptor); keyCounter.SetReceptor(receptor);
keyCounter.AddTriggerRange(KeyBindingContainer.DefaultKeyBindings keyCounter.AddRange(KeyBindingContainer.DefaultKeyBindings
.Select(b => b.GetAction<T>()) .Select(b => b.GetAction<T>())
.Distinct() .Distinct()
.OrderBy(action => action) .OrderBy(action => action)

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

@ -36,7 +36,7 @@ namespace osu.Game.Screens.Play.HUD
Size = keyFlow.Size; Size = keyFlow.Size;
} }
public override void AddTrigger(InputTrigger trigger) public override void Add(InputTrigger trigger) =>
keyFlow.Add(new DefaultKeyCounter(trigger) keyFlow.Add(new DefaultKeyCounter(trigger)
{ {
FadeTime = key_fade_time, FadeTime = key_fade_time,

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

@ -51,16 +51,14 @@ namespace osu.Game.Screens.Play.HUD
} }
/// <summary> /// <summary>
/// Adds a new <see cref="KeyCounter"/> to this <see cref="KeyCounterDisplay"/>. /// Add a <see cref="InputTrigger"/> to this display.
/// </summary> /// </summary>
/// <param name="trigger">The <see cref="InputTrigger"/> the resulting <see cref="KeyCounter"/> will react to.</param> public abstract void Add(InputTrigger trigger);
public abstract void AddTrigger(InputTrigger trigger);
/// <summary> /// <summary>
/// Adds a range of new <see cref="KeyCounter"/>s to this <see cref="KeyCounterDisplay"/>. /// Add a range of <see cref="InputTrigger"/> to this display.
/// </summary> /// </summary>
/// <param name="triggers">The <see cref="InputTrigger"/>s the resulting <see cref="KeyCounter"/>s will react to.</param> public void AddRange(IEnumerable<InputTrigger> triggers) => triggers.ForEach(Add);
public void AddTriggerRange(IEnumerable<InputTrigger> triggers) => triggers.ForEach(AddTrigger);
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuConfigManager config) private void load(OsuConfigManager config)