Skip to content

Show all keybinds in menu tips instead of only the first one #38004

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
diquoks wants to merge 1 commit into
base: master
Choose a base branch
from
+10 −15
Open

Show all keybinds in menu tips instead of only the first one #38004

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 10 additions & 15 deletions osu.Game/Screens/Menu/MenuTipDisplay.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.

using System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Extensions.Color4Extensions;
Expand Down Expand Up @@ -127,12 +126,10 @@ private LocalisableString getRandomTip()
switch (tipIndex)
{
case 0:
return MenuTipStrings.ToggleToolbarShortcut(
keyBindingStore.GetReadableKeyCombinationsFor(GlobalAction.ToggleToolbar).FirstOrDefault() ?? InputSettingsStrings.ActionHasNoKeyBinding);
return MenuTipStrings.ToggleToolbarShortcut(keyBindingStore.GetBindingsStringFor(GlobalAction.ToggleToolbar));

case 1:
return MenuTipStrings.GameSettingsShortcut(
keyBindingStore.GetReadableKeyCombinationsFor(GlobalAction.ToggleSettings).FirstOrDefault() ?? InputSettingsStrings.ActionHasNoKeyBinding);
return MenuTipStrings.GameSettingsShortcut(keyBindingStore.GetBindingsStringFor(GlobalAction.ToggleSettings));

case 2:
return MenuTipStrings.DynamicSettings;
Expand All @@ -147,8 +144,7 @@ private LocalisableString getRandomTip()
return MenuTipStrings.ScreenScalingSettings;

case 6:
return MenuTipStrings.FreeOsuDirect(keyBindingStore.GetReadableKeyCombinationsFor(GlobalAction.ToggleBeatmapListing).FirstOrDefault()
?? InputSettingsStrings.ActionHasNoKeyBinding);
return MenuTipStrings.FreeOsuDirect(keyBindingStore.GetBindingsStringFor(GlobalAction.ToggleBeatmapListing));

case 7:
return MenuTipStrings.ReplaySeeking;
Expand Down Expand Up @@ -178,16 +174,16 @@ private LocalisableString getRandomTip()
return MenuTipStrings.GlobalStatisticsShortcut;

case 16:
return MenuTipStrings.ReplayPausing(keyBindingStore.GetReadableKeyCombinationsFor(GlobalAction.TogglePauseReplay).FirstOrDefault() ?? InputSettingsStrings.ActionHasNoKeyBinding);
return MenuTipStrings.ReplayPausing(keyBindingStore.GetBindingsStringFor(GlobalAction.TogglePauseReplay));

case 17:
return MenuTipStrings.ConfigurableHotkeys;

case 18:
return MenuTipStrings.PeekHUDWhenHidden(keyBindingStore.GetReadableKeyCombinationsFor(GlobalAction.HoldForHUD).FirstOrDefault() ?? InputSettingsStrings.ActionHasNoKeyBinding);
return MenuTipStrings.PeekHUDWhenHidden(keyBindingStore.GetBindingsStringFor(GlobalAction.HoldForHUD));

case 19:
return MenuTipStrings.SkinEditor(keyBindingStore.GetReadableKeyCombinationsFor(GlobalAction.ToggleSkinEditor).FirstOrDefault() ?? InputSettingsStrings.ActionHasNoKeyBinding);
return MenuTipStrings.SkinEditor(keyBindingStore.GetBindingsStringFor(GlobalAction.ToggleSkinEditor));

case 20:
return MenuTipStrings.DragAndDropImageInSkinEditor;
Expand All @@ -200,14 +196,13 @@ private LocalisableString getRandomTip()

case 23:
return MenuTipStrings.SkinChangeShortcuts([
keyBindingStore.GetReadableKeyCombinationsFor(GlobalAction.RandomSkin).FirstOrDefault() ?? InputSettingsStrings.ActionHasNoKeyBinding,
keyBindingStore.GetReadableKeyCombinationsFor(GlobalAction.PreviousSkin).FirstOrDefault() ?? InputSettingsStrings.ActionHasNoKeyBinding,
keyBindingStore.GetReadableKeyCombinationsFor(GlobalAction.NextSkin).FirstOrDefault() ?? InputSettingsStrings.ActionHasNoKeyBinding,
keyBindingStore.GetBindingsStringFor(GlobalAction.RandomSkin),
keyBindingStore.GetBindingsStringFor(GlobalAction.PreviousSkin),
keyBindingStore.GetBindingsStringFor(GlobalAction.NextSkin),
]);

case 24:
return MenuTipStrings.ToggleReplaySettingsShortcut(keyBindingStore.GetReadableKeyCombinationsFor(GlobalAction.ToggleReplaySettings).FirstOrDefault()
?? InputSettingsStrings.ActionHasNoKeyBinding);
return MenuTipStrings.ToggleReplaySettingsShortcut(keyBindingStore.GetBindingsStringFor(GlobalAction.ToggleReplaySettings));

case 25:
return MenuTipStrings.CopyModsFromScore;
Expand Down
Loading