h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-05-25 11:10:07 +08:00
Code Issues Releases Wiki Activity

Merge pull request #35111 from smoogipoo/quick-play-keybinds

Browse Source 
Add keybinds to matchmaking queue screen
This commit is contained in:
Dean Herbert
2025-09-30 23:19:33 +09:00
committed by GitHub
Unverified
parent 38278eaaac 6e39e714e1
commit 919c47b918
4 changed files with 89 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game/Graphics/Containers/OsuClickableContainer.cs
+11 -1
View File
@@ -18,6 +18,8 @@ namespace osu.Game.Graphics.Containers
private readonly Container content = new Container { RelativeSizeAxes = Axes.Both };
private HoverSounds samples = null!;
public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) =>
// base call is checked for cases when `OsuClickableContainer` has masking applied to it directly (ie. externally in object initialisation).
base.ReceivePositionalInputAt(screenSpacePos)
@@ -33,6 +35,14 @@ namespace osu.Game.Graphics.Containers
this.sampleSet = sampleSet;
}
public void TriggerClickWithSound()
{
TriggerClick();
// TriggerClick doesn't recursively fire the event so we need to manually do this.
(samples as HoverClickSounds)?.PlayClickSample();
}
public virtual LocalisableString TooltipText { get; set; }
[BackgroundDependencyLoader]
@@ -46,7 +56,7 @@ namespace osu.Game.Graphics.Containers
AddRangeInternal(new Drawable[]
{
CreateHoverSounds(sampleSet),
samples = CreateHoverSounds(sampleSet),
content,
});
}
osu.Game/Graphics/UserInterface/HoverClickSounds.cs
+18 -15
View File
@@ -42,18 +42,20 @@ namespace osu.Game.Graphics.UserInterface
this.buttons = buttons ?? new[] { MouseButton.Left };
}
[BackgroundDependencyLoader]
private void load(AudioManager audio)
{
sampleClick = audio.Samples.Get($@"UI/{SampleSet.GetDescription()}-select")
?? audio.Samples.Get($@"UI/{HoverSampleSet.Default.GetDescription()}-select");
sampleClickDisabled = audio.Samples.Get($@"UI/{SampleSet.GetDescription()}-select-disabled")
?? audio.Samples.Get($@"UI/{HoverSampleSet.Default.GetDescription()}-select-disabled");
}
protected override bool OnClick(ClickEvent e)
{
if (buttons.Contains(e.Button))
{
var channel = Enabled.Value ? sampleClick?.GetChannel() : sampleClickDisabled?.GetChannel();
if (channel != null)
{
channel.Frequency.Value = 0.99 + RNG.NextDouble(0.02);
channel.Play();
}
}
PlayClickSample();
return base.OnClick(e);
}
@@ -66,14 +68,15 @@ namespace osu.Game.Graphics.UserInterface
base.PlayHoverSample();
}
[BackgroundDependencyLoader]
private void load(AudioManager audio)
public void PlayClickSample()
{
sampleClick = audio.Samples.Get($@"UI/{SampleSet.GetDescription()}-select")
?? audio.Samples.Get($@"UI/{HoverSampleSet.Default.GetDescription()}-select");
var channel = Enabled.Value ? sampleClick?.GetChannel() : sampleClickDisabled?.GetChannel();
sampleClickDisabled = audio.Samples.Get($@"UI/{SampleSet.GetDescription()}-select-disabled")
?? audio.Samples.Get($@"UI/{HoverSampleSet.Default.GetDescription()}-select-disabled");
if (channel != null)
{
channel.Frequency.Value = 0.99 + RNG.NextDouble(0.02);
channel.Play();
}
}
}
}
osu.Game/Screens/OnlinePlay/Matchmaking/Queue/PoolSelector.cs
+32 -5
View File
@@ -1,6 +1,7 @@
// 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.Graphics;
@@ -15,6 +16,7 @@ using osu.Game.Overlays;
using osu.Game.Rulesets;
using osuTK;
using osuTK.Graphics;
using osuTK.Input;
namespace osu.Game.Screens.OnlinePlay.Matchmaking.Queue
{
@@ -64,8 +66,34 @@ namespace osu.Game.Screens.OnlinePlay.Matchmaking.Queue
}, true);
}
protected override bool OnKeyDown(KeyDownEvent e)
{
var currentSelection = poolFlow.SingleOrDefault(b => b.IsSelected);
switch (e.Key)
{
case Key.Left:
{
var next = poolFlow.Reverse().SkipWhile(b => b != currentSelection).Skip(1).FirstOrDefault();
(next ?? poolFlow.Last()).TriggerClickWithSound();
return true;
}
case Key.Right:
{
var next = poolFlow.SkipWhile(b => b != currentSelection).Skip(1).FirstOrDefault();
(next ?? poolFlow.First()).TriggerClickWithSound();
return true;
}
}
return false;
}
private partial class SelectorButton : OsuAnimatedButton
{
public bool IsSelected => SelectedPool.Value?.Equals(pool) == true;
public readonly Bindable<MatchmakingPool?> SelectedPool = new Bindable<MatchmakingPool?>();
[Resolved]
@@ -77,6 +105,7 @@ namespace osu.Game.Screens.OnlinePlay.Matchmaking.Queue
private Box flashLayer = null!;
public SelectorButton(MatchmakingPool pool)
: base(HoverSampleSet.ButtonSidebar)
{
this.pool = pool;
@@ -129,23 +158,21 @@ namespace osu.Game.Screens.OnlinePlay.Matchmaking.Queue
protected override bool OnHover(HoverEvent e)
{
if (!isSelected)
if (!IsSelected)
flashLayer.FadeTo(0.05f, 200, Easing.OutQuint);
return base.OnHover(e);
}
protected override void OnHoverLost(HoverLostEvent e)
{
if (!isSelected)
if (!IsSelected)
flashLayer.FadeTo(0f, 200, Easing.OutQuint);
base.OnHoverLost(e);
}
private bool isSelected => SelectedPool.Value?.Equals(pool) == true;
private void onSelectionChanged(ValueChangedEvent<MatchmakingPool?> selection)
{
if (isSelected)
if (IsSelected)
{
this.ScaleTo(1.2f, 200, Easing.OutQuint);
iconSprite.FadeColour(Color4.Gold, 100, Easing.OutQuint);
osu.Game/Screens/OnlinePlay/Matchmaking/Queue/ScreenQueue.cs
+28 -2
View File
@@ -15,11 +15,14 @@ using osu.Framework.Extensions.ObjectExtensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Input.Bindings;
using osu.Framework.Input.Events;
using osu.Framework.Screens;
using osu.Game.Database;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface;
using osu.Game.Input.Bindings;
using osu.Game.Online.API;
using osu.Game.Online.API.Requests.Responses;
using osu.Game.Online.Matchmaking;
@@ -350,7 +353,7 @@ namespace osu.Game.Screens.OnlinePlay.Matchmaking.Queue
Text = "Found a match!",
Font = OsuFont.GetFont(size: 32, weight: FontWeight.Regular, typeface: Typeface.TorusAlternate),
},
new ShearedButton(200)
new SelectionButton(200)
{
DarkerColour = colours.YellowDark,
LighterColour = colours.YellowLight,
@@ -440,7 +443,7 @@ namespace osu.Game.Screens.OnlinePlay.Matchmaking.Queue
InRoom
}
private partial class BeginQueueingButton : ShearedButton
private partial class BeginQueueingButton : SelectionButton
{
public readonly IBindable<MatchmakingPool?> SelectedPool = new Bindable<MatchmakingPool?>();
@@ -456,5 +459,28 @@ namespace osu.Game.Screens.OnlinePlay.Matchmaking.Queue
SelectedPool.BindValueChanged(p => Enabled.Value = p.NewValue != null, true);
}
}
private partial class SelectionButton : ShearedButton, IKeyBindingHandler<GlobalAction>
{
public SelectionButton(float? width = null, float height = DEFAULT_HEIGHT)
: base(width, height)
{
}
public bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
{
if (e.Action == GlobalAction.Select && !e.Repeat)
{
TriggerClickWithSound();
return true;
}
return false;
}
public void OnReleased(KeyBindingReleaseEvent<GlobalAction> e)
{
}
}
}
}