From 813d6fed487d06959f18f19e982639e08a95d9dc Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 4 May 2022 09:00:54 +0300
Subject: [PATCH] Split activation keybind to separate increase/decrease
keybinds
---
.../Input/Bindings/GlobalActionContainer.cs | 10 +++--
.../GlobalActionKeyBindingStrings.cs | 9 ++++-
.../Edit/DistancedHitObjectComposer.cs | 40 +++++++++++--------
3 files changed, 38 insertions(+), 21 deletions(-)
diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 5656c79975..3e7051cbf5 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -79,7 +79,8 @@ namespace osu.Game.Input.Bindings
new KeyBinding(new[] { InputKey.F5 }, GlobalAction.EditorTestGameplay),
new KeyBinding(new[] { InputKey.Control, InputKey.H }, GlobalAction.EditorFlipHorizontally),
new KeyBinding(new[] { InputKey.Control, InputKey.J }, GlobalAction.EditorFlipVertically),
- new KeyBinding(new[] { InputKey.Control, InputKey.Alt }, GlobalAction.EditorDistanceSpacing),
+ new KeyBinding(new[] { InputKey.Control, InputKey.Alt, InputKey.MouseWheelDown }, GlobalAction.EditorDecreaseDistanceSpacing),
+ new KeyBinding(new[] { InputKey.Control, InputKey.Alt, InputKey.MouseWheelUp }, GlobalAction.EditorIncreaseDistanceSpacing),
};
public IEnumerable<KeyBinding> InGameKeyBindings => new[]
@@ -303,7 +304,10 @@ namespace osu.Game.Input.Bindings
[LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.EditorFlipVertically))]
EditorFlipVertically,
- [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.EditorDistanceSpacing))]
- EditorDistanceSpacing,
+ [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.EditorIncreaseDistanceSpacing))]
+ EditorIncreaseDistanceSpacing,
+
+ [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.EditorDecreaseDistanceSpacing))]
+ EditorDecreaseDistanceSpacing,
}
}
diff --git a/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs b/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs
index 73cc7546ab..5086e7f4c7 100644
--- a/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs
+++ b/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs
@@ -240,9 +240,14 @@ namespace osu.Game.Localisation
public static LocalisableString EditorFlipVertically => new TranslatableString(getKey(@"editor_flip_vertically"), @"Flip selection vertically");
/// <summary>
- /// "Distance grid spacing (hold)"
+ /// "Increase distance grid spacing"
/// </summary>
- public static LocalisableString EditorDistanceSpacing => new TranslatableString(getKey(@"editor_distance_spacing"), @"Distance grid spacing (hold)");
+ public static LocalisableString EditorIncreaseDistanceSpacing => new TranslatableString(getKey(@"editor_increase_distance_spacing"), @"Increase distance grid spacing");
+
+ /// <summary>
+ /// "Decrease distance grid spacing"
+ /// </summary>
+ public static LocalisableString EditorDecreaseDistanceSpacing => new TranslatableString(getKey(@"editor_decrease_distance_spacing"), @"Decrease distance grid spacing");
/// <summary>
/// "Toggle skin editor"
diff --git a/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs b/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs
index 1a4ea845d0..e6bc36622f 100644
--- a/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Edit
/// </summary>
/// <typeparam name="TObject">The base type of supported objects.</typeparam>
[Cached(typeof(IDistanceSnapProvider))]
- public abstract class DistancedHitObjectComposer<TObject> : HitObjectComposer<TObject>, IDistanceSnapProvider, IKeyBindingHandler<GlobalAction>
+ public abstract class DistancedHitObjectComposer<TObject> : HitObjectComposer<TObject>, IDistanceSnapProvider, IScrollBindingHandler<GlobalAction>
where TObject : HitObject
{
protected Bindable<double> DistanceSpacingMultiplier { get; } = new BindableDouble(1.0)
@@ -35,7 +35,6 @@ namespace osu.Game.Rulesets.Edit
protected ExpandingToolboxContainer RightSideToolboxContainer { get; private set; }
private ExpandableSlider<double, SizeSlider<double>> distanceSpacingSlider;
- private bool distanceSpacingScrollActive;
protected DistancedHitObjectComposer(Ruleset ruleset)
: base(ruleset)
@@ -79,11 +78,11 @@ namespace osu.Game.Rulesets.Edit
public bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
{
- if (!DistanceSpacingMultiplier.Disabled && e.Action == GlobalAction.EditorDistanceSpacing)
+ switch (e.Action)
{
- RightSideToolboxContainer.Expanded.Value = true;
- distanceSpacingScrollActive = true;
- return true;
+ case GlobalAction.EditorIncreaseDistanceSpacing:
+ case GlobalAction.EditorDecreaseDistanceSpacing:
+ return adjustDistanceSpacing(e.Action, 0.1f);
}
return false;
@@ -91,22 +90,31 @@ namespace osu.Game.Rulesets.Edit
public void OnReleased(KeyBindingReleaseEvent<GlobalAction> e)
{
- if (!DistanceSpacingMultiplier.Disabled && e.Action == GlobalAction.EditorDistanceSpacing)
- {
- RightSideToolboxContainer.Expanded.Value = false;
- distanceSpacingScrollActive = false;
- }
}
- protected override bool OnScroll(ScrollEvent e)
+ public bool OnScroll(KeyBindingScrollEvent<GlobalAction> e)
{
- if (distanceSpacingScrollActive)
+ switch (e.Action)
{
- DistanceSpacingMultiplier.Value += e.ScrollDelta.Y * (e.IsPrecise ? 0.01f : 0.1f);
- return true;
+ case GlobalAction.EditorIncreaseDistanceSpacing:
+ case GlobalAction.EditorDecreaseDistanceSpacing:
+ return adjustDistanceSpacing(e.Action, e.IsPrecise ? 0.01f : 0.1f);
}
- return base.OnScroll(e);
+ return false;
+ }
+
+ private bool adjustDistanceSpacing(GlobalAction action, float amount)
+ {
+ if (DistanceSpacingMultiplier.Disabled)
+ return false;
+
+ if (action == GlobalAction.EditorIncreaseDistanceSpacing)
+ DistanceSpacingMultiplier.Value += amount;
+ else if (action == GlobalAction.EditorDecreaseDistanceSpacing)
+ DistanceSpacingMultiplier.Value -= amount;
+
+ return true;
}
public virtual float GetBeatSnapDistanceAt(HitObject referenceObject)