mirror of
https://github.com/ppy/osu.git
synced 2026-05-13 20:33:35 +08:00
Replace MacOS hitsound composer "Alt" text tooltip with "Opt". (#37156)
- Closes https://github.com/ppy/osu/issues/37055 In the editor, keybinds and the tooltip for the hitsounding section are hardcoded. Since the keybind contains "Alt", this is inconsistent on MacOS where "Opt" is used instead. Before: <img width="191" height="244" alt="image" src="https://github.com/user-attachments/assets/749f9dd1-f037-4061-848e-44161913190d" /> After (MacOS only): <img width="193" height="244" alt="image" src="https://github.com/user-attachments/assets/c807a23d-225e-41ab-993a-df9230be58bc" /> --------- Co-authored-by: Dean Herbert <pe@ppy.sh>
This commit is contained in:
committed by
GitHub
Unverified
parent
fc817627e5
commit
9f665cbf11
@@ -14,6 +14,7 @@ using osu.Framework.Graphics;
|
||||
using osu.Framework.Graphics.Containers;
|
||||
using osu.Framework.Graphics.Shapes;
|
||||
using osu.Framework.Input;
|
||||
using osu.Framework.Input.Bindings;
|
||||
using osu.Framework.Input.Events;
|
||||
using osu.Framework.Logging;
|
||||
using osu.Framework.Testing;
|
||||
@@ -106,7 +107,7 @@ namespace osu.Game.Rulesets.Edit
|
||||
dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
|
||||
|
||||
[BackgroundDependencyLoader(true)]
|
||||
private void load(OsuConfigManager config, [CanBeNull] Editor editor)
|
||||
private void load(OsuConfigManager config, [CanBeNull] Editor editor, ReadableKeyCombinationProvider keyCombinationProvider)
|
||||
{
|
||||
autoSeekOnPlacement = config.GetBindable<bool>(OsuSetting.EditorAutoSeekOnPlacement);
|
||||
|
||||
@@ -135,6 +136,9 @@ namespace osu.Game.Rulesets.Edit
|
||||
|
||||
dependencies.CacheAs(Playfield);
|
||||
|
||||
string shiftDisplay = keyCombinationProvider.GetReadableString(new KeyCombination(InputKey.Shift));
|
||||
string altDisplay = keyCombinationProvider.GetReadableString(new KeyCombination(InputKey.Alt));
|
||||
|
||||
InternalChildren = new[]
|
||||
{
|
||||
PlayfieldContentContainer = new Container
|
||||
@@ -180,7 +184,7 @@ namespace osu.Game.Rulesets.Edit
|
||||
Spacing = new Vector2(0, 5),
|
||||
},
|
||||
},
|
||||
new EditorToolboxGroup("bank (Shift/Alt-Q~R)")
|
||||
new EditorToolboxGroup($"bank ({shiftDisplay}/{altDisplay}-Q~R)")
|
||||
{
|
||||
Child = new FillFlowContainer
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user