mirror of https://github.com/ppy/osu
Remove code bloat from `ClickableAvatar`
This commit is contained in:
parent
ab81397119
commit
0b41dbf579
|
@ -4,26 +4,17 @@
|
|||
#nullable disable
|
||||
|
||||
using osu.Framework.Allocation;
|
||||
using osu.Framework.Graphics;
|
||||
using osu.Framework.Graphics.Containers;
|
||||
using osu.Framework.Input.Events;
|
||||
using osu.Framework.Localisation;
|
||||
using osu.Game.Graphics.Containers;
|
||||
using osu.Game.Online.API.Requests.Responses;
|
||||
|
||||
namespace osu.Game.Users.Drawables
|
||||
{
|
||||
public partial class ClickableAvatar : Container
|
||||
public partial class ClickableAvatar : OsuClickableContainer
|
||||
{
|
||||
private const string default_tooltip_text = "view profile";
|
||||
|
||||
/// <summary>
|
||||
/// Whether to open the user's profile when clicked.
|
||||
/// </summary>
|
||||
public bool OpenOnClick
|
||||
{
|
||||
set => clickableArea.Enabled.Value = clickableArea.Action != null && value;
|
||||
}
|
||||
public override LocalisableString TooltipText { get; set; } = default_tooltip_text;
|
||||
|
||||
/// <summary>
|
||||
/// By default, the tooltip will show "view profile" as avatars are usually displayed next to a username.
|
||||
|
@ -31,7 +22,7 @@ public bool OpenOnClick
|
|||
/// </summary>
|
||||
public bool ShowUsernameTooltip
|
||||
{
|
||||
set => clickableArea.TooltipText = value ? (user?.Username ?? string.Empty) : default_tooltip_text;
|
||||
set => TooltipText = value ? (user?.Username ?? string.Empty) : default_tooltip_text;
|
||||
}
|
||||
|
||||
private readonly APIUser user;
|
||||
|
@ -39,30 +30,22 @@ public bool ShowUsernameTooltip
|
|||
[Resolved(CanBeNull = true)]
|
||||
private OsuGame game { get; set; }
|
||||
|
||||
private readonly ClickableArea clickableArea;
|
||||
|
||||
/// <summary>
|
||||
/// A clickable avatar for the specified user, with UI sounds included.
|
||||
/// If <see cref="OpenOnClick"/> is <c>true</c>, clicking will open the user's profile.
|
||||
/// </summary>
|
||||
/// <param name="user">The user. A null value will get a placeholder avatar.</param>
|
||||
public ClickableAvatar(APIUser user = null)
|
||||
{
|
||||
this.user = user;
|
||||
|
||||
Add(clickableArea = new ClickableArea
|
||||
{
|
||||
RelativeSizeAxes = Axes.Both,
|
||||
});
|
||||
|
||||
if (user?.Id != APIUser.SYSTEM_USER_ID)
|
||||
clickableArea.Action = openProfile;
|
||||
Action = openProfile;
|
||||
}
|
||||
|
||||
[BackgroundDependencyLoader]
|
||||
private void load()
|
||||
{
|
||||
LoadComponentAsync(new DrawableAvatar(user), clickableArea.Add);
|
||||
LoadComponentAsync(new DrawableAvatar(user), Add);
|
||||
}
|
||||
|
||||
private void openProfile()
|
||||
|
@ -70,24 +53,5 @@ private void openProfile()
|
|||
if (user?.Id > 1 || !string.IsNullOrEmpty(user?.Username))
|
||||
game?.ShowUser(user);
|
||||
}
|
||||
|
||||
private partial class ClickableArea : OsuClickableContainer
|
||||
{
|
||||
private LocalisableString tooltip = default_tooltip_text;
|
||||
|
||||
public override LocalisableString TooltipText
|
||||
{
|
||||
get => Enabled.Value ? tooltip : default;
|
||||
set => tooltip = value;
|
||||
}
|
||||
|
||||
protected override bool OnClick(ClickEvent e)
|
||||
{
|
||||
if (!Enabled.Value)
|
||||
return false;
|
||||
|
||||
return base.OnClick(e);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -76,7 +76,6 @@ protected override Drawable CreateDrawable(APIUser user)
|
|||
{
|
||||
return new ClickableAvatar(user)
|
||||
{
|
||||
OpenOnClick = true,
|
||||
ShowUsernameTooltip = showUsernameTooltip,
|
||||
RelativeSizeAxes = Axes.Both,
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue