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

Ensure Master volume is updated when scrolling on toolbar button

Browse Source
This commit is contained in:
Dean Herbert 2022-06-15 15:41:38 +09:00
parent 1f31e3fb51
commit 5eb56ab814
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Game/Overlays/Toolbar/ToolbarMusicButton.cs
View File

@ -77,6 +77,7 @@ namespace osu.Game.Overlays.Toolbar
protected override bool OnScroll(ScrollEvent e) protected override bool OnScroll(ScrollEvent e)
{ {
volume?.FocusMasterVolume();
volume?.Adjust(GlobalAction.IncreaseVolume, e.ScrollDelta.Y, e.IsPrecise); volume?.Adjust(GlobalAction.IncreaseVolume, e.ScrollDelta.Y, e.IsPrecise);
return true; return true;
} }

7
osu.Game/Overlays/VolumeOverlay.cs
View File

@ -140,11 +140,16 @@ namespace osu.Game.Overlays
private ScheduledDelegate popOutDelegate; private ScheduledDelegate popOutDelegate;
public void FocusMasterVolume()
{
volumeMeters.Select(volumeMeterMaster);
}
public override void Show() public override void Show()
{ {
// Focus on the master meter as a default if previously hidden // Focus on the master meter as a default if previously hidden
if (State.Value == Visibility.Hidden) if (State.Value == Visibility.Hidden)
volumeMeters.Select(volumeMeterMaster); FocusMasterVolume();
if (State.Value == Visibility.Visible) if (State.Value == Visibility.Visible)
schedulePopOut(); schedulePopOut();