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

Merge pull request #14694 from nekodex/no-avatar-click-sound 

Don't play hover/select sounds for UpdatableAvatar unless it's clickable
This commit is contained in:
Dean Herbert 2021-09-13 15:14:43 +09:00 committed by GitHub
parent f9c82a9098 8d1e43423e
commit 0c646f6dbd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
View File

@ -61,7 +61,7 @@ private void load(OverlayColourProvider colourProvider)
Origin = Anchor.CentreLeft,
Children = new Drawable[]
{
avatar = new UpdateableAvatar(openOnClick: false, showGuestOnNull: false)
avatar = new UpdateableAvatar(isInteractive: false, showGuestOnNull: false)
{
Size = new Vector2(avatar_size),
Masking = true,

2
osu.Game/Overlays/Toolbar/ToolbarUserButton.cs
View File

@ -32,7 +32,7 @@ public ToolbarUserButton()
Add(new OpaqueBackground { Depth = 1 });
Flow.Add(avatar = new UpdateableAvatar(openOnClick: false)
Flow.Add(avatar = new UpdateableAvatar(isInteractive: false)
{
Masking = true,
Size = new Vector2(32),

32
osu.Game/Users/Drawables/UpdateableAvatar.cs
View File

@ -44,7 +44,7 @@ public User User
protected override double LoadDelay => 200;
private readonly bool openOnClick;
private readonly bool isInteractive;
private readonly bool showUsernameTooltip;
private readonly bool showGuestOnNull;
@ -52,12 +52,12 @@ public User User
/// Construct a new UpdateableAvatar.
/// </summary>
/// <param name="user">The initial user to display.</param>
/// <param name="openOnClick">Whether to open the user's profile when clicked.</param>
/// <param name="showUsernameTooltip">Whether to show the username rather than "view profile" on the tooltip.</param>
/// <param name="isInteractive">If set to true, hover/click sounds will play and clicking the avatar will open the user's profile.</param>
/// <param name="showUsernameTooltip">Whether to show the username rather than "view profile" on the tooltip. (note: this only applies if <paramref name="isInteractive"/> is also true)</param>
/// <param name="showGuestOnNull">Whether to show a default guest representation on null user (as opposed to nothing).</param>
public UpdateableAvatar(User user = null, bool openOnClick = true, bool showUsernameTooltip = false, bool showGuestOnNull = true)
public UpdateableAvatar(User user = null, bool isInteractive = true, bool showUsernameTooltip = false, bool showGuestOnNull = true)
{
this.openOnClick = openOnClick;
this.isInteractive = isInteractive;
this.showUsernameTooltip = showUsernameTooltip;
this.showGuestOnNull = showGuestOnNull;
@ -69,14 +69,22 @@ protected override Drawable CreateDrawable(User user)
if (user == null && !showGuestOnNull)
return null;
var avatar = new ClickableAvatar(user)
if (isInteractive)
{
OpenOnClick = openOnClick,
ShowUsernameTooltip = showUsernameTooltip,
RelativeSizeAxes = Axes.Both,
};
return avatar;
return new ClickableAvatar(user)
{
OpenOnClick = true,
ShowUsernameTooltip = showUsernameTooltip,
RelativeSizeAxes = Axes.Both,
};
}
else
{
return new DrawableAvatar(user)
{
RelativeSizeAxes = Axes.Both,
};
}
}
}
}