From 70e3cb190653f14b23a28277c662542ff896366f Mon Sep 17 00:00:00 2001 From: Leander Furumo Date: Sat, 12 Oct 2024 23:45:06 +0200 Subject: [PATCH 1/2] fix conflicting keybind "convert to stream" in editor as of writing it conflicts with the "toggle fps" keybind --- .../Editor/TestSceneSliderStreamConversion.cs | 2 +- .../Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderStreamConversion.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderStreamConversion.cs index a162d9a49156..a992423ea8a5 100644 --- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderStreamConversion.cs +++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderStreamConversion.cs @@ -142,7 +142,7 @@ private void convertToStream() { InputManager.PressKey(Key.LControl); InputManager.PressKey(Key.LShift); - InputManager.Key(Key.F); + InputManager.Key(Key.Z); InputManager.ReleaseKey(Key.LShift); InputManager.ReleaseKey(Key.LControl); }); diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs index c72f547565cb..7d8dc190e9be 100644 --- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs +++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs @@ -600,7 +600,7 @@ private void convertToStream() }, new OsuMenuItem("Convert to stream", MenuItemType.Destructive, convertToStream) { - Hotkey = new Hotkey(new KeyCombination(InputKey.Control, InputKey.Shift, InputKey.F)) + Hotkey = new Hotkey(new KeyCombination(InputKey.Control, InputKey.Shift, InputKey.Z)) }, }; From 508bb23f65f9bc259aa149cdb7eb10e57ef53d5f Mon Sep 17 00:00:00 2001 From: Leander Furumo Date: Sun, 13 Oct 2024 00:22:34 +0200 Subject: [PATCH 2/2] Rebind "convert to stream" to Ctrl-Shift-X --- .../Editor/TestSceneSliderStreamConversion.cs | 2 +- .../Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderStreamConversion.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderStreamConversion.cs index a992423ea8a5..8024f1d51dcd 100644 --- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderStreamConversion.cs +++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderStreamConversion.cs @@ -142,7 +142,7 @@ private void convertToStream() { InputManager.PressKey(Key.LControl); InputManager.PressKey(Key.LShift); - InputManager.Key(Key.Z); + InputManager.Key(Key.X); InputManager.ReleaseKey(Key.LShift); InputManager.ReleaseKey(Key.LControl); }); diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs index 7d8dc190e9be..3aa90b07eb7c 100644 --- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs +++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs @@ -391,7 +391,7 @@ protected override bool OnKeyDown(KeyDownEvent e) if (!IsSelected) return false; - if (e.Key == Key.F && e.ControlPressed && e.ShiftPressed) + if (e.Key == Key.X && e.ControlPressed && e.ShiftPressed) { convertToStream(); return true; @@ -600,7 +600,7 @@ private void convertToStream() }, new OsuMenuItem("Convert to stream", MenuItemType.Destructive, convertToStream) { - Hotkey = new Hotkey(new KeyCombination(InputKey.Control, InputKey.Shift, InputKey.Z)) + Hotkey = new Hotkey(new KeyCombination(InputKey.Control, InputKey.Shift, InputKey.X)) }, };