1
0
mirror of https://github.com/ppy/osu synced 2024-12-16 03:45:46 +00:00

Fix left side of carousel blocking volume adjust hotkeys

Closes https://github.com/ppy/osu/issues/25234.

A little ad-hoc, but probably fine...?
This commit is contained in:
Bartłomiej Dach 2023-10-26 16:26:31 +02:00
parent 5d6a58d443
commit 2fa2217381
No known key found for this signature in database

View File

@ -1028,7 +1028,10 @@ namespace osu.Game.Screens.Select
this.resetCarouselPosition = resetCarouselPosition;
}
protected override bool OnScroll(ScrollEvent e) => true;
// we want to block plain scrolls on the left side so that they don't scroll the carousel,
// but also we *don't* want to handle scrolls when they're combined with keyboard modifiers
// as those will usually correspond to other interactions like adjusting volume.
protected override bool OnScroll(ScrollEvent e) => !e.ControlPressed && !e.AltPressed && !e.ShiftPressed && !e.SuperPressed;
protected override bool OnMouseDown(MouseDownEvent e) => true;