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

Just set music shortcut text locally

Browse Source
This commit is contained in:
Joehu 2020-11-23 20:43:46 -08:00
parent 52f5473cc0
commit 1fd4b04767
4 changed files with 18 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Configuration/OsuConfigManager.cs
View File

@ -196,7 +196,7 @@ namespace osu.Game.Configuration
public Func<int, string> LookupSkinName { private get; set; } public Func<int, string> LookupSkinName { private get; set; }
public Func<GlobalAction?, string> LookupKeyBindings { get; set; } public Func<GlobalAction, string> LookupKeyBindings { get; set; }
} }
public enum OsuSetting public enum OsuSetting

2
osu.Game/Input/KeyBindingStore.cs
View File

@ -37,7 +37,7 @@ namespace osu.Game.Input
/// </summary> /// </summary>
/// <param name="globalAction">The action to lookup.</param> /// <param name="globalAction">The action to lookup.</param>
/// <returns>A set of display strings for all the user's key configuration for the action.</returns> /// <returns>A set of display strings for all the user's key configuration for the action.</returns>
public IEnumerable<string> GetReadableKeyCombinationsFor(GlobalAction? globalAction) public IEnumerable<string> GetReadableKeyCombinationsFor(GlobalAction globalAction)
{ {
foreach (var action in Query().Where(b => (GlobalAction)b.Action == globalAction)) foreach (var action in Query().Where(b => (GlobalAction)b.Action == globalAction))
{ {

12
osu.Game/Overlays/Music/MusicKeyBindingHandler.cs
View File

@ -6,6 +6,7 @@ using osu.Framework.Bindables;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Input.Bindings; using osu.Framework.Input.Bindings;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Configuration;
using osu.Game.Input.Bindings; using osu.Game.Input.Bindings;
using osu.Game.Overlays.OSD; using osu.Game.Overlays.OSD;
@ -72,9 +73,18 @@ namespace osu.Game.Overlays.Music
private class MusicActionToast : Toast private class MusicActionToast : Toast
{ {
private readonly GlobalAction action;
public MusicActionToast(string value, GlobalAction action) public MusicActionToast(string value, GlobalAction action)
: base("Music Playback", value, action: action) : base("Music Playback", value, string.Empty)
{ {
this.action = action;
}
[BackgroundDependencyLoader]
private void load(OsuConfigManager config)
{
ShortcutText.Text = config.LookupKeyBindings(action).ToUpperInvariant();
} }
} }
} }

34
osu.Game/Overlays/OSD/Toast.cs
View File

@ -1,14 +1,11 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // 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. // See the LICENCE file in the repository root for full licence text.
using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using osu.Game.Configuration;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osu.Game.Input.Bindings;
using osuTK; using osuTK;
using osuTK.Graphics; using osuTK.Graphics;
@ -20,21 +17,14 @@ namespace osu.Game.Overlays.OSD
private readonly Container content; private readonly Container content;
private readonly OsuSpriteText spriteText;
private readonly string shortcut;
private readonly GlobalAction? action;
protected override Container<Drawable> Content => content; protected override Container<Drawable> Content => content;
protected readonly OsuSpriteText ValueText; protected readonly OsuSpriteText ValueText;
protected Toast(string description, string value, string shortcut = null, GlobalAction? action = null) protected readonly OsuSpriteText ShortcutText;
{
this.shortcut = shortcut;
this.action = action;
protected Toast(string description, string value, string shortcut)
{
Anchor = Anchor.Centre; Anchor = Anchor.Centre;
Origin = Anchor.Centre; Origin = Anchor.Centre;
@ -81,7 +71,7 @@ namespace osu.Game.Overlays.OSD
Origin = Anchor.Centre, Origin = Anchor.Centre,
Text = value Text = value
}, },
spriteText = new OsuSpriteText ShortcutText = new OsuSpriteText
{ {
Anchor = Anchor.BottomCentre, Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomCentre, Origin = Anchor.BottomCentre,
@ -89,23 +79,9 @@ namespace osu.Game.Overlays.OSD
Alpha = 0.3f, Alpha = 0.3f,
Margin = new MarginPadding { Bottom = 15 }, Margin = new MarginPadding { Bottom = 15 },
Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold), Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold),
Text = string.IsNullOrEmpty(shortcut) ? "NO KEY BOUND" : shortcut.ToUpperInvariant()
}, },
}; };
} }
[BackgroundDependencyLoader]
private void load(OsuConfigManager config)
{
string text;
if (action != null)
text = config.LookupKeyBindings(action);
else if (!string.IsNullOrEmpty(shortcut))
text = shortcut;
else
text = "no key bound";
spriteText.Text = text.ToUpperInvariant();
}
} }
} }