h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 12:33:01 +08:00
Code Issues Releases Wiki Activity

Change distance spacing keybind to Ctrl+Alt

Browse Source
This commit is contained in:
Salman Ahmed 2022-04-27 17:11:23 +03:00
parent 0738cd028f
commit 66c730c382
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game.Rulesets.Osu/Edit/OsuToolboxComposite.cs
View File

@ -12,7 +12,6 @@ using osu.Game.Overlays.Settings.Sections;
using osu.Game.Rulesets.Edit; using osu.Game.Rulesets.Edit;
using osu.Game.Screens.Edit; using osu.Game.Screens.Edit;
using osuTK; using osuTK;
using osuTK.Input;
namespace osu.Game.Rulesets.Osu.Edit namespace osu.Game.Rulesets.Osu.Edit
{ {
@ -74,7 +73,7 @@ namespace osu.Game.Rulesets.Osu.Edit
protected override bool OnKeyDown(KeyDownEvent e) 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; expandingContainer.Expanded.Value = true;
distanceSpacingScrollActive = true; distanceSpacingScrollActive = true;
@ -86,7 +85,7 @@ namespace osu.Game.Rulesets.Osu.Edit
protected override void OnKeyUp(KeyUpEvent e) protected override void OnKeyUp(KeyUpEvent e)
{ {
if (distanceSpacingScrollActive && (!e.AltPressed || e.Key == Key.D)) if (distanceSpacingScrollActive && (!e.AltPressed || !e.ControlPressed))
{ {
expandingContainer.Expanded.Value = false; expandingContainer.Expanded.Value = false;
distanceSpacingScrollActive = false; distanceSpacingScrollActive = false;

4
osu.Game.Tests/Visual/Editing/TestSceneHitObjectComposer.cs
View File

@ -95,14 +95,14 @@ namespace osu.Game.Tests.Visual.Editing
AddStep("retrieve original spacing", () => originalSpacing = (float)editorBeatmap.BeatmapInfo.DistanceSpacing); 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 alt", () => InputManager.PressKey(Key.LAlt));
AddStep("hold D", () => InputManager.PressKey(Key.D));
AddStep("scroll mouse 5 steps", () => InputManager.ScrollVerticalBy(5)); AddStep("scroll mouse 5 steps", () => InputManager.ScrollVerticalBy(5));
AddAssert("distance spacing increased by 0.5", () => Precision.AlmostEquals(editorBeatmap.BeatmapInfo.DistanceSpacing, originalSpacing + 0.5f)); AddAssert("distance spacing increased by 0.5", () => Precision.AlmostEquals(editorBeatmap.BeatmapInfo.DistanceSpacing, originalSpacing + 0.5f));
AddStep("release alt", () => InputManager.ReleaseKey(Key.LAlt)); 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 public class EditorBeatmapContainer : Container