diff --git a/osu.Game.Rulesets.Osu/Edit/OsuToolboxComposite.cs b/osu.Game.Rulesets.Osu/Edit/OsuToolboxComposite.cs index 542f98207e..17232db509 100644 --- a/osu.Game.Rulesets.Osu/Edit/OsuToolboxComposite.cs +++ b/osu.Game.Rulesets.Osu/Edit/OsuToolboxComposite.cs @@ -12,7 +12,6 @@ using osu.Game.Overlays.Settings.Sections; using osu.Game.Rulesets.Edit; using osu.Game.Screens.Edit; using osuTK; -using osuTK.Input; namespace osu.Game.Rulesets.Osu.Edit { @@ -74,7 +73,7 @@ namespace osu.Game.Rulesets.Osu.Edit protected override bool OnKeyDown(KeyDownEvent e) { - if (e.AltPressed && e.Key == Key.D && !e.Repeat) + if (e.ControlPressed && e.AltPressed && !e.Repeat) { expandingContainer.Expanded.Value = true; distanceSpacingScrollActive = true; @@ -86,7 +85,7 @@ namespace osu.Game.Rulesets.Osu.Edit protected override void OnKeyUp(KeyUpEvent e) { - if (distanceSpacingScrollActive && (!e.AltPressed || e.Key == Key.D)) + if (distanceSpacingScrollActive && (!e.AltPressed || !e.ControlPressed)) { expandingContainer.Expanded.Value = false; distanceSpacingScrollActive = false; diff --git a/osu.Game.Tests/Visual/Editing/TestSceneHitObjectComposer.cs b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectComposer.cs index d542732e19..7039d7d8a4 100644 --- a/osu.Game.Tests/Visual/Editing/TestSceneHitObjectComposer.cs +++ b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectComposer.cs @@ -95,14 +95,14 @@ namespace osu.Game.Tests.Visual.Editing AddStep("retrieve original spacing", () => originalSpacing = (float)editorBeatmap.BeatmapInfo.DistanceSpacing); + AddStep("hold ctrl", () => InputManager.PressKey(Key.LControl)); AddStep("hold alt", () => InputManager.PressKey(Key.LAlt)); - AddStep("hold D", () => InputManager.PressKey(Key.D)); AddStep("scroll mouse 5 steps", () => InputManager.ScrollVerticalBy(5)); AddAssert("distance spacing increased by 0.5", () => Precision.AlmostEquals(editorBeatmap.BeatmapInfo.DistanceSpacing, originalSpacing + 0.5f)); AddStep("release alt", () => InputManager.ReleaseKey(Key.LAlt)); - AddStep("release D", () => InputManager.ReleaseKey(Key.D)); + AddStep("release ctrl", () => InputManager.ReleaseKey(Key.LControl)); } public class EditorBeatmapContainer : Container