mirror of
https://github.com/ppy/osu.git
synced 2025-01-27 14:12:56 +08:00
Merge pull request #9791 from Joehuu/toolbar-keybinding-tooltips
This commit is contained in:
commit
c68fb92d00
@ -67,8 +67,6 @@ namespace osu.Game
|
|||||||
[NotNull]
|
[NotNull]
|
||||||
private readonly NotificationOverlay notifications = new NotificationOverlay();
|
private readonly NotificationOverlay notifications = new NotificationOverlay();
|
||||||
|
|
||||||
private NowPlayingOverlay nowPlaying;
|
|
||||||
|
|
||||||
private BeatmapListingOverlay beatmapListing;
|
private BeatmapListingOverlay beatmapListing;
|
||||||
|
|
||||||
private DashboardOverlay dashboard;
|
private DashboardOverlay dashboard;
|
||||||
@ -650,7 +648,7 @@ namespace osu.Game
|
|||||||
Origin = Anchor.TopRight,
|
Origin = Anchor.TopRight,
|
||||||
}, rightFloatingOverlayContent.Add, true);
|
}, rightFloatingOverlayContent.Add, true);
|
||||||
|
|
||||||
loadComponentSingleFile(nowPlaying = new NowPlayingOverlay
|
loadComponentSingleFile(new NowPlayingOverlay
|
||||||
{
|
{
|
||||||
GetToolbarHeight = () => ToolbarOffset,
|
GetToolbarHeight = () => ToolbarOffset,
|
||||||
Anchor = Anchor.TopRight,
|
Anchor = Anchor.TopRight,
|
||||||
@ -862,18 +860,6 @@ namespace osu.Game
|
|||||||
|
|
||||||
switch (action)
|
switch (action)
|
||||||
{
|
{
|
||||||
case GlobalAction.ToggleNowPlaying:
|
|
||||||
nowPlaying.ToggleVisibility();
|
|
||||||
return true;
|
|
||||||
|
|
||||||
case GlobalAction.ToggleChat:
|
|
||||||
chatOverlay.ToggleVisibility();
|
|
||||||
return true;
|
|
||||||
|
|
||||||
case GlobalAction.ToggleSocial:
|
|
||||||
dashboard.ToggleVisibility();
|
|
||||||
return true;
|
|
||||||
|
|
||||||
case GlobalAction.ResetInputSettings:
|
case GlobalAction.ResetInputSettings:
|
||||||
var sensitivity = frameworkConfig.GetBindable<double>(FrameworkSetting.CursorSensitivity);
|
var sensitivity = frameworkConfig.GetBindable<double>(FrameworkSetting.CursorSensitivity);
|
||||||
|
|
||||||
@ -889,18 +875,6 @@ namespace osu.Game
|
|||||||
Toolbar.ToggleVisibility();
|
Toolbar.ToggleVisibility();
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
case GlobalAction.ToggleSettings:
|
|
||||||
Settings.ToggleVisibility();
|
|
||||||
return true;
|
|
||||||
|
|
||||||
case GlobalAction.ToggleDirect:
|
|
||||||
beatmapListing.ToggleVisibility();
|
|
||||||
return true;
|
|
||||||
|
|
||||||
case GlobalAction.ToggleNotifications:
|
|
||||||
notifications.ToggleVisibility();
|
|
||||||
return true;
|
|
||||||
|
|
||||||
case GlobalAction.ToggleGameplayMouseButtons:
|
case GlobalAction.ToggleGameplayMouseButtons:
|
||||||
LocalConfig.Set(OsuSetting.MouseDisableButtons, !LocalConfig.Get<bool>(OsuSetting.MouseDisableButtons));
|
LocalConfig.Set(OsuSetting.MouseDisableButtons, !LocalConfig.Get<bool>(OsuSetting.MouseDisableButtons));
|
||||||
return true;
|
return true;
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
|
|
||||||
using osu.Framework.Allocation;
|
using osu.Framework.Allocation;
|
||||||
using osu.Game.Graphics;
|
using osu.Game.Graphics;
|
||||||
|
using osu.Game.Input.Bindings;
|
||||||
|
|
||||||
namespace osu.Game.Overlays.Toolbar
|
namespace osu.Game.Overlays.Toolbar
|
||||||
{
|
{
|
||||||
@ -13,6 +14,8 @@ namespace osu.Game.Overlays.Toolbar
|
|||||||
SetIcon(OsuIcon.ChevronDownCircle);
|
SetIcon(OsuIcon.ChevronDownCircle);
|
||||||
TooltipMain = "Beatmap listing";
|
TooltipMain = "Beatmap listing";
|
||||||
TooltipSub = "Browse for new beatmaps";
|
TooltipSub = "Browse for new beatmaps";
|
||||||
|
|
||||||
|
Hotkey = GlobalAction.ToggleDirect;
|
||||||
}
|
}
|
||||||
|
|
||||||
[BackgroundDependencyLoader(true)]
|
[BackgroundDependencyLoader(true)]
|
||||||
|
@ -1,27 +1,34 @@
|
|||||||
// 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.Caching;
|
||||||
using osu.Framework.Extensions.Color4Extensions;
|
using osu.Framework.Extensions.Color4Extensions;
|
||||||
using osu.Framework.Graphics;
|
using osu.Framework.Graphics;
|
||||||
using osu.Framework.Graphics.Containers;
|
using osu.Framework.Graphics.Containers;
|
||||||
using osu.Framework.Graphics.Effects;
|
using osu.Framework.Graphics.Effects;
|
||||||
|
using osu.Framework.Graphics.Shapes;
|
||||||
using osu.Framework.Graphics.Sprites;
|
using osu.Framework.Graphics.Sprites;
|
||||||
|
using osu.Framework.Input.Bindings;
|
||||||
|
using osu.Framework.Input.Events;
|
||||||
using osu.Game.Graphics;
|
using osu.Game.Graphics;
|
||||||
using osu.Game.Graphics.Backgrounds;
|
using osu.Game.Graphics.Backgrounds;
|
||||||
|
using osu.Game.Graphics.Containers;
|
||||||
using osu.Game.Graphics.Sprites;
|
using osu.Game.Graphics.Sprites;
|
||||||
|
using osu.Game.Graphics.UserInterface;
|
||||||
|
using osu.Game.Input;
|
||||||
|
using osu.Game.Input.Bindings;
|
||||||
using osuTK;
|
using osuTK;
|
||||||
using osuTK.Graphics;
|
using osuTK.Graphics;
|
||||||
using osu.Framework.Graphics.Shapes;
|
|
||||||
using osu.Framework.Input.Events;
|
|
||||||
using osu.Game.Graphics.Containers;
|
|
||||||
using osu.Game.Graphics.UserInterface;
|
|
||||||
|
|
||||||
namespace osu.Game.Overlays.Toolbar
|
namespace osu.Game.Overlays.Toolbar
|
||||||
{
|
{
|
||||||
public class ToolbarButton : OsuClickableContainer
|
public abstract class ToolbarButton : OsuClickableContainer, IKeyBindingHandler<GlobalAction>
|
||||||
{
|
{
|
||||||
public const float WIDTH = Toolbar.HEIGHT * 1.4f;
|
public const float WIDTH = Toolbar.HEIGHT * 1.4f;
|
||||||
|
|
||||||
|
protected GlobalAction? Hotkey { get; set; }
|
||||||
|
|
||||||
public void SetIcon(Drawable icon)
|
public void SetIcon(Drawable icon)
|
||||||
{
|
{
|
||||||
IconContainer.Icon = icon;
|
IconContainer.Icon = icon;
|
||||||
@ -66,9 +73,13 @@ namespace osu.Game.Overlays.Toolbar
|
|||||||
private readonly FillFlowContainer tooltipContainer;
|
private readonly FillFlowContainer tooltipContainer;
|
||||||
private readonly SpriteText tooltip1;
|
private readonly SpriteText tooltip1;
|
||||||
private readonly SpriteText tooltip2;
|
private readonly SpriteText tooltip2;
|
||||||
|
private readonly SpriteText keyBindingTooltip;
|
||||||
protected FillFlowContainer Flow;
|
protected FillFlowContainer Flow;
|
||||||
|
|
||||||
public ToolbarButton()
|
[Resolved]
|
||||||
|
private KeyBindingStore keyBindings { get; set; }
|
||||||
|
|
||||||
|
protected ToolbarButton()
|
||||||
: base(HoverSampleSet.Loud)
|
: base(HoverSampleSet.Loud)
|
||||||
{
|
{
|
||||||
Width = WIDTH;
|
Width = WIDTH;
|
||||||
@ -123,7 +134,7 @@ namespace osu.Game.Overlays.Toolbar
|
|||||||
Origin = TooltipAnchor,
|
Origin = TooltipAnchor,
|
||||||
Position = new Vector2(TooltipAnchor.HasFlag(Anchor.x0) ? 5 : -5, 5),
|
Position = new Vector2(TooltipAnchor.HasFlag(Anchor.x0) ? 5 : -5, 5),
|
||||||
Alpha = 0,
|
Alpha = 0,
|
||||||
Children = new[]
|
Children = new Drawable[]
|
||||||
{
|
{
|
||||||
tooltip1 = new OsuSpriteText
|
tooltip1 = new OsuSpriteText
|
||||||
{
|
{
|
||||||
@ -132,17 +143,44 @@ namespace osu.Game.Overlays.Toolbar
|
|||||||
Shadow = true,
|
Shadow = true,
|
||||||
Font = OsuFont.GetFont(size: 22, weight: FontWeight.Bold),
|
Font = OsuFont.GetFont(size: 22, weight: FontWeight.Bold),
|
||||||
},
|
},
|
||||||
tooltip2 = new OsuSpriteText
|
new FillFlowContainer
|
||||||
{
|
{
|
||||||
|
AutoSizeAxes = Axes.Both,
|
||||||
Anchor = TooltipAnchor,
|
Anchor = TooltipAnchor,
|
||||||
Origin = TooltipAnchor,
|
Origin = TooltipAnchor,
|
||||||
Shadow = true,
|
Direction = FillDirection.Horizontal,
|
||||||
|
Children = new[]
|
||||||
|
{
|
||||||
|
tooltip2 = new OsuSpriteText { Shadow = true },
|
||||||
|
keyBindingTooltip = new OsuSpriteText { Shadow = true }
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private readonly Cached tooltipKeyBinding = new Cached();
|
||||||
|
|
||||||
|
[BackgroundDependencyLoader]
|
||||||
|
private void load()
|
||||||
|
{
|
||||||
|
keyBindings.KeyBindingChanged += () => tooltipKeyBinding.Invalidate();
|
||||||
|
updateKeyBindingTooltip();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void updateKeyBindingTooltip()
|
||||||
|
{
|
||||||
|
if (tooltipKeyBinding.IsValid)
|
||||||
|
return;
|
||||||
|
|
||||||
|
var binding = keyBindings.Query().Find(b => (GlobalAction)b.Action == Hotkey);
|
||||||
|
var keyBindingString = binding?.KeyCombination.ReadableString();
|
||||||
|
keyBindingTooltip.Text = !string.IsNullOrEmpty(keyBindingString) ? $" ({keyBindingString})" : string.Empty;
|
||||||
|
|
||||||
|
tooltipKeyBinding.Validate();
|
||||||
|
}
|
||||||
|
|
||||||
protected override bool OnMouseDown(MouseDownEvent e) => true;
|
protected override bool OnMouseDown(MouseDownEvent e) => true;
|
||||||
|
|
||||||
protected override bool OnClick(ClickEvent e)
|
protected override bool OnClick(ClickEvent e)
|
||||||
@ -154,6 +192,8 @@ namespace osu.Game.Overlays.Toolbar
|
|||||||
|
|
||||||
protected override bool OnHover(HoverEvent e)
|
protected override bool OnHover(HoverEvent e)
|
||||||
{
|
{
|
||||||
|
updateKeyBindingTooltip();
|
||||||
|
|
||||||
HoverBackground.FadeIn(200);
|
HoverBackground.FadeIn(200);
|
||||||
tooltipContainer.FadeIn(100);
|
tooltipContainer.FadeIn(100);
|
||||||
return base.OnHover(e);
|
return base.OnHover(e);
|
||||||
@ -164,6 +204,21 @@ namespace osu.Game.Overlays.Toolbar
|
|||||||
HoverBackground.FadeOut(200);
|
HoverBackground.FadeOut(200);
|
||||||
tooltipContainer.FadeOut(100);
|
tooltipContainer.FadeOut(100);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public bool OnPressed(GlobalAction action)
|
||||||
|
{
|
||||||
|
if (action == Hotkey)
|
||||||
|
{
|
||||||
|
Click();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void OnReleased(GlobalAction action)
|
||||||
|
{
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public class OpaqueBackground : Container
|
public class OpaqueBackground : Container
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
|
|
||||||
using osu.Framework.Allocation;
|
using osu.Framework.Allocation;
|
||||||
using osu.Framework.Graphics.Sprites;
|
using osu.Framework.Graphics.Sprites;
|
||||||
|
using osu.Game.Input.Bindings;
|
||||||
|
|
||||||
namespace osu.Game.Overlays.Toolbar
|
namespace osu.Game.Overlays.Toolbar
|
||||||
{
|
{
|
||||||
@ -13,6 +14,8 @@ namespace osu.Game.Overlays.Toolbar
|
|||||||
SetIcon(FontAwesome.Solid.Comments);
|
SetIcon(FontAwesome.Solid.Comments);
|
||||||
TooltipMain = "Chat";
|
TooltipMain = "Chat";
|
||||||
TooltipSub = "Join the real-time discussion";
|
TooltipSub = "Join the real-time discussion";
|
||||||
|
|
||||||
|
Hotkey = GlobalAction.ToggleChat;
|
||||||
}
|
}
|
||||||
|
|
||||||
[BackgroundDependencyLoader(true)]
|
[BackgroundDependencyLoader(true)]
|
||||||
|
@ -2,33 +2,19 @@
|
|||||||
// 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.Graphics.Sprites;
|
using osu.Framework.Graphics.Sprites;
|
||||||
using osu.Framework.Input.Bindings;
|
|
||||||
using osu.Game.Input.Bindings;
|
using osu.Game.Input.Bindings;
|
||||||
|
|
||||||
namespace osu.Game.Overlays.Toolbar
|
namespace osu.Game.Overlays.Toolbar
|
||||||
{
|
{
|
||||||
public class ToolbarHomeButton : ToolbarButton, IKeyBindingHandler<GlobalAction>
|
public class ToolbarHomeButton : ToolbarButton
|
||||||
{
|
{
|
||||||
public ToolbarHomeButton()
|
public ToolbarHomeButton()
|
||||||
{
|
{
|
||||||
Icon = FontAwesome.Solid.Home;
|
Icon = FontAwesome.Solid.Home;
|
||||||
TooltipMain = "Home";
|
TooltipMain = "Home";
|
||||||
TooltipSub = "Return to the main menu";
|
TooltipSub = "Return to the main menu";
|
||||||
}
|
|
||||||
|
|
||||||
public bool OnPressed(GlobalAction action)
|
Hotkey = GlobalAction.Home;
|
||||||
{
|
|
||||||
if (action == GlobalAction.Home)
|
|
||||||
{
|
|
||||||
Click();
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void OnReleased(GlobalAction action)
|
|
||||||
{
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2,17 +2,23 @@
|
|||||||
// 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.Allocation;
|
||||||
|
using osu.Framework.Graphics;
|
||||||
using osu.Framework.Graphics.Sprites;
|
using osu.Framework.Graphics.Sprites;
|
||||||
|
using osu.Game.Input.Bindings;
|
||||||
|
|
||||||
namespace osu.Game.Overlays.Toolbar
|
namespace osu.Game.Overlays.Toolbar
|
||||||
{
|
{
|
||||||
public class ToolbarMusicButton : ToolbarOverlayToggleButton
|
public class ToolbarMusicButton : ToolbarOverlayToggleButton
|
||||||
{
|
{
|
||||||
|
protected override Anchor TooltipAnchor => Anchor.TopRight;
|
||||||
|
|
||||||
public ToolbarMusicButton()
|
public ToolbarMusicButton()
|
||||||
{
|
{
|
||||||
Icon = FontAwesome.Solid.Music;
|
Icon = FontAwesome.Solid.Music;
|
||||||
TooltipMain = "Now playing";
|
TooltipMain = "Now playing";
|
||||||
TooltipSub = "Manage the currently playing track";
|
TooltipSub = "Manage the currently playing track";
|
||||||
|
|
||||||
|
Hotkey = GlobalAction.ToggleNowPlaying;
|
||||||
}
|
}
|
||||||
|
|
||||||
[BackgroundDependencyLoader(true)]
|
[BackgroundDependencyLoader(true)]
|
||||||
|
@ -9,6 +9,7 @@ using osu.Framework.Graphics.Shapes;
|
|||||||
using osu.Framework.Graphics.Sprites;
|
using osu.Framework.Graphics.Sprites;
|
||||||
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;
|
||||||
|
|
||||||
@ -28,6 +29,8 @@ namespace osu.Game.Overlays.Toolbar
|
|||||||
TooltipMain = "Notifications";
|
TooltipMain = "Notifications";
|
||||||
TooltipSub = "Waiting for 'ya";
|
TooltipSub = "Waiting for 'ya";
|
||||||
|
|
||||||
|
Hotkey = GlobalAction.ToggleNotifications;
|
||||||
|
|
||||||
Add(countDisplay = new CountCircle
|
Add(countDisplay = new CountCircle
|
||||||
{
|
{
|
||||||
Alpha = 0,
|
Alpha = 0,
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
|
|
||||||
using osu.Framework.Allocation;
|
using osu.Framework.Allocation;
|
||||||
using osu.Framework.Graphics.Sprites;
|
using osu.Framework.Graphics.Sprites;
|
||||||
|
using osu.Game.Input.Bindings;
|
||||||
|
|
||||||
namespace osu.Game.Overlays.Toolbar
|
namespace osu.Game.Overlays.Toolbar
|
||||||
{
|
{
|
||||||
@ -13,6 +14,8 @@ namespace osu.Game.Overlays.Toolbar
|
|||||||
Icon = FontAwesome.Solid.Cog;
|
Icon = FontAwesome.Solid.Cog;
|
||||||
TooltipMain = "Settings";
|
TooltipMain = "Settings";
|
||||||
TooltipSub = "Change your settings";
|
TooltipSub = "Change your settings";
|
||||||
|
|
||||||
|
Hotkey = GlobalAction.ToggleSettings;
|
||||||
}
|
}
|
||||||
|
|
||||||
[BackgroundDependencyLoader(true)]
|
[BackgroundDependencyLoader(true)]
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
|
|
||||||
using osu.Framework.Allocation;
|
using osu.Framework.Allocation;
|
||||||
using osu.Framework.Graphics.Sprites;
|
using osu.Framework.Graphics.Sprites;
|
||||||
|
using osu.Game.Input.Bindings;
|
||||||
|
|
||||||
namespace osu.Game.Overlays.Toolbar
|
namespace osu.Game.Overlays.Toolbar
|
||||||
{
|
{
|
||||||
@ -13,6 +14,8 @@ namespace osu.Game.Overlays.Toolbar
|
|||||||
Icon = FontAwesome.Solid.Users;
|
Icon = FontAwesome.Solid.Users;
|
||||||
TooltipMain = "Friends";
|
TooltipMain = "Friends";
|
||||||
TooltipSub = "Interact with those close to you";
|
TooltipSub = "Interact with those close to you";
|
||||||
|
|
||||||
|
Hotkey = GlobalAction.ToggleSocial;
|
||||||
}
|
}
|
||||||
|
|
||||||
[BackgroundDependencyLoader(true)]
|
[BackgroundDependencyLoader(true)]
|
||||||
|
Loading…
Reference in New Issue
Block a user