RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-26 00:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix checkbox sounds not being used for certain checkboxes

Browse Source
This commit is contained in:
Jamie Taylor 2021-06-18 21:00:08 +09:00
parent d462394635
commit 953683044f
No known key found for this signature in database
GPG Key ID: 2ACFA8B6370B8C8C
4 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs
View File

@ -4,6 +4,8 @@
using osuTK; using osuTK;
using osuTK.Graphics; using osuTK.Graphics;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Audio;
using osu.Framework.Audio.Sample;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
@ -43,6 +45,8 @@ namespace osu.Game.Graphics.UserInterface
} }
private const float transition_length = 500; private const float transition_length = 500;
private Sample sampleChecked;
private Sample sampleUnchecked;
public OsuTabControlCheckbox() public OsuTabControlCheckbox()
{ {
@ -77,8 +81,7 @@ namespace osu.Game.Graphics.UserInterface
Colour = Color4.White, Colour = Color4.White,
Origin = Anchor.BottomLeft, Origin = Anchor.BottomLeft,
Anchor = Anchor.BottomLeft, Anchor = Anchor.BottomLeft,
}, }
new HoverClickSounds()
}; };
Current.ValueChanged += selected => Current.ValueChanged += selected =>
@ -91,10 +94,13 @@ namespace osu.Game.Graphics.UserInterface
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colours) private void load(OsuColour colours, AudioManager audio)
{ {
if (accentColour == null) if (accentColour == null)
AccentColour = colours.Blue; AccentColour = colours.Blue;
sampleChecked = audio.Samples.Get(@"UI/check-on");
sampleUnchecked = audio.Samples.Get(@"UI/check-off");
} }
protected override bool OnHover(HoverEvent e) protected override bool OnHover(HoverEvent e)
@ -111,6 +117,16 @@ namespace osu.Game.Graphics.UserInterface
base.OnHoverLost(e); base.OnHoverLost(e);
} }
protected override void OnUserChange(bool value)
{
base.OnUserChange(value);
if (value)
sampleChecked?.Play();
else
sampleUnchecked?.Play();
}
private void updateFade() private void updateFade()
{ {
box.FadeTo(Current.Value || IsHovered ? 1 : 0, transition_length, Easing.OutQuint); box.FadeTo(Current.Value || IsHovered ? 1 : 0, transition_length, Easing.OutQuint);

17
osu.Game/Overlays/Comments/CommentsHeader.cs
View File

@ -2,6 +2,8 @@
// 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.Audio;
using osu.Framework.Audio.Sample;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Bindables; using osu.Framework.Bindables;
@ -66,6 +68,8 @@ namespace osu.Game.Overlays.Comments
public readonly BindableBool Checked = new BindableBool(); public readonly BindableBool Checked = new BindableBool();
private readonly SpriteIcon checkboxIcon; private readonly SpriteIcon checkboxIcon;
private Sample sampleChecked;
private Sample sampleUnchecked;
public ShowDeletedButton() public ShowDeletedButton()
{ {
@ -93,6 +97,13 @@ namespace osu.Game.Overlays.Comments
}); });
} }
[BackgroundDependencyLoader]
private void load(AudioManager audio)
{
sampleChecked = audio.Samples.Get(@"UI/check-on");
sampleUnchecked = audio.Samples.Get(@"UI/check-off");
}
protected override void LoadComplete() protected override void LoadComplete()
{ {
Checked.BindValueChanged(isChecked => checkboxIcon.Icon = isChecked.NewValue ? FontAwesome.Solid.CheckSquare : FontAwesome.Regular.Square, true); Checked.BindValueChanged(isChecked => checkboxIcon.Icon = isChecked.NewValue ? FontAwesome.Solid.CheckSquare : FontAwesome.Regular.Square, true);
@ -102,6 +113,12 @@ namespace osu.Game.Overlays.Comments
protected override bool OnClick(ClickEvent e) protected override bool OnClick(ClickEvent e)
{ {
Checked.Value = !Checked.Value; Checked.Value = !Checked.Value;
if (Checked.Value)
sampleChecked?.Play();
else
sampleUnchecked?.Play();
return true; return true;
} }
} }

2
osu.Game/Overlays/Comments/HeaderButton.cs
View File

@ -6,7 +6,6 @@ using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using osu.Framework.Input.Events; using osu.Framework.Input.Events;
using osu.Game.Graphics.UserInterface;
namespace osu.Game.Overlays.Comments namespace osu.Game.Overlays.Comments
{ {
@ -39,7 +38,6 @@ namespace osu.Game.Overlays.Comments
Origin = Anchor.Centre, Origin = Anchor.Centre,
Margin = new MarginPadding { Horizontal = 10 } Margin = new MarginPadding { Horizontal = 10 }
}, },
new HoverClickSounds(),
}); });
} }

2
osu.Game/Overlays/OverlaySortTabControl.cs
View File

@ -148,6 +148,8 @@ namespace osu.Game.Overlays
} }
} }
}); });
AddInternal(new HoverClickSounds());
} }
protected override void LoadComplete() protected override void LoadComplete()