mirror of
https://github.com/ppy/osu.git
synced 2025-01-28 02:43:19 +08:00
Merge pull request #5369 from Joehuu/remove-unnecessary-transforms-1
Remove unnecessary transforms on top score user section
This commit is contained in:
commit
7558ac1445
@ -62,7 +62,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
|
||||
},
|
||||
}
|
||||
},
|
||||
avatar = new UpdateableAvatar(hideImmediately: true)
|
||||
avatar = new UpdateableAvatar
|
||||
{
|
||||
Anchor = Anchor.Centre,
|
||||
Origin = Anchor.Centre,
|
||||
@ -99,7 +99,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
|
||||
Origin = Anchor.CentreLeft,
|
||||
Font = OsuFont.GetFont(size: 15, weight: FontWeight.Bold)
|
||||
},
|
||||
flag = new UpdateableFlag(hideImmediately: true)
|
||||
flag = new UpdateableFlag
|
||||
{
|
||||
Anchor = Anchor.CentreLeft,
|
||||
Origin = Anchor.CentreLeft,
|
||||
|
@ -5,7 +5,6 @@ using osu.Framework.Bindables;
|
||||
using osu.Framework.Graphics;
|
||||
using osu.Framework.Graphics.Containers;
|
||||
using osu.Framework.Graphics.Effects;
|
||||
using osu.Framework.Graphics.Transforms;
|
||||
|
||||
namespace osu.Game.Users.Drawables
|
||||
{
|
||||
@ -38,8 +37,6 @@ namespace osu.Game.Users.Drawables
|
||||
set => base.EdgeEffect = value;
|
||||
}
|
||||
|
||||
protected override bool TransformImmediately { get; }
|
||||
|
||||
/// <summary>
|
||||
/// Whether to show a default guest representation on null user (as opposed to nothing).
|
||||
/// </summary>
|
||||
@ -50,14 +47,11 @@ namespace osu.Game.Users.Drawables
|
||||
/// </summary>
|
||||
public readonly BindableBool OpenOnClick = new BindableBool(true);
|
||||
|
||||
public UpdateableAvatar(User user = null, bool hideImmediately = false)
|
||||
public UpdateableAvatar(User user = null)
|
||||
{
|
||||
TransformImmediately = hideImmediately;
|
||||
User = user;
|
||||
}
|
||||
|
||||
protected override TransformSequence<Drawable> ApplyHideTransforms(Drawable drawable) => TransformImmediately ? drawable?.FadeOut() : base.ApplyHideTransforms(drawable);
|
||||
|
||||
protected override Drawable CreateDrawable(User user)
|
||||
{
|
||||
if (user == null && !ShowGuestOnNull)
|
||||
|
@ -3,7 +3,6 @@
|
||||
|
||||
using osu.Framework.Graphics;
|
||||
using osu.Framework.Graphics.Containers;
|
||||
using osu.Framework.Graphics.Transforms;
|
||||
|
||||
namespace osu.Game.Users.Drawables
|
||||
{
|
||||
@ -15,21 +14,16 @@ namespace osu.Game.Users.Drawables
|
||||
set => Model = value;
|
||||
}
|
||||
|
||||
protected override bool TransformImmediately { get; }
|
||||
|
||||
/// <summary>
|
||||
/// Whether to show a place holder on null country.
|
||||
/// </summary>
|
||||
public bool ShowPlaceholderOnNull = true;
|
||||
|
||||
public UpdateableFlag(Country country = null, bool hideImmediately = false)
|
||||
public UpdateableFlag(Country country = null)
|
||||
{
|
||||
TransformImmediately = hideImmediately;
|
||||
Country = country;
|
||||
}
|
||||
|
||||
protected override TransformSequence<Drawable> ApplyHideTransforms(Drawable drawable) => TransformImmediately ? drawable?.FadeOut() : base.ApplyHideTransforms(drawable);
|
||||
|
||||
protected override Drawable CreateDrawable(Country country)
|
||||
{
|
||||
if (country == null && !ShowPlaceholderOnNull)
|
||||
|
Loading…
Reference in New Issue
Block a user