RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9029 from peppy/fix-mute-button-ui-scaling 

Fix mute button falling off the screen when UI scaling is used
This commit is contained in:
Dan Balasescu 2020-05-15 13:00:44 +09:00 committed by GitHub
parent fd2f2dbd42 94cf99bf97
commit 8872eace3d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,6 +46,13 @@ private void load(AudioManager audio, OsuColour colours)
Width = 300,
Colour = ColourInfo.GradientHorizontal(Color4.Black.Opacity(0.75f), Color4.Black.Opacity(0))
},
muteButton = new MuteButton
{
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,
Margin = new MarginPadding(10),
Current = { BindTarget = IsMuted }
},
new FillFlowContainer
{
Direction = FillDirection.Vertical,
@ -56,19 +63,11 @@ private void load(AudioManager audio, OsuColour colours)
Margin = new MarginPadding { Left = offset },
Children = new Drawable[]
{
volumeMeterEffect = new VolumeMeter("EFFECTS", 125, colours.BlueDarker)
{
Margin = new MarginPadding { Top = 100 + MuteButton.HEIGHT } // to counter the mute button and re-center the volume meters
},
volumeMeterEffect = new VolumeMeter("EFFECTS", 125, colours.BlueDarker),
volumeMeterMaster = new VolumeMeter("MASTER", 150, colours.PinkDarker),
volumeMeterMusic = new VolumeMeter("MUSIC", 125, colours.BlueDarker),
muteButton = new MuteButton
{
Margin = new MarginPadding { Top = 100 },
Current = { BindTarget = IsMuted }
}
}
},
}
});
volumeMeterMaster.Bindable.BindTo(audio.Volume);