h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-12 23:12:56 +08:00
Code Issues Releases Wiki Activity

Only hide UpdateableAvatar/Flag immediately

Browse Source
This commit is contained in:
HoLLy 2019-06-24 18:24:31 +02:00
parent 7734c4b41a
commit 739077ef4f
3 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
View File

@ -53,7 +53,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
Size = new Vector2(40), Size = new Vector2(40),
FillMode = FillMode.Fit, FillMode = FillMode.Fit,
}, },
avatar = new UpdateableAvatar(transformImmediately: true) avatar = new UpdateableAvatar(hideImmediately: true)
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
@ -90,7 +90,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
Origin = Anchor.CentreLeft, Origin = Anchor.CentreLeft,
Font = OsuFont.GetFont(size: 15, weight: FontWeight.Bold) Font = OsuFont.GetFont(size: 15, weight: FontWeight.Bold)
}, },
flag = new UpdateableFlag(transformImmediately: true) flag = new UpdateableFlag(hideImmediately: true)
{ {
Anchor = Anchor.CentreLeft, Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft, Origin = Anchor.CentreLeft,

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

@ -5,6 +5,7 @@ using osu.Framework.Bindables;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Effects; using osu.Framework.Graphics.Effects;
using osu.Framework.Graphics.Transforms;
namespace osu.Game.Users.Drawables namespace osu.Game.Users.Drawables
{ {
@ -51,17 +52,14 @@ namespace osu.Game.Users.Drawables
/// </summary> /// </summary>
public readonly BindableBool OpenOnClick = new BindableBool(true); public readonly BindableBool OpenOnClick = new BindableBool(true);
public UpdateableAvatar(User user = null, bool transformImmediately = false) public UpdateableAvatar(User user = null, bool hideImmediately = false)
{ {
TransformImmediately = hideImmediately;
User = user; User = user;
if (transformImmediately)
{
TransformDuration = 0;
TransformImmediately = true;
}
} }
protected override TransformSequence<Drawable> ApplyHideTransforms(Drawable drawable) => TransformImmediately ? drawable?.FadeOut() : base.ApplyHideTransforms(drawable);
protected override Drawable CreateDrawable(User user) protected override Drawable CreateDrawable(User user)
{ {
if (user == null && !ShowGuestOnNull) if (user == null && !ShowGuestOnNull)

12
osu.Game/Users/Drawables/UpdateableFlag.cs
View File

@ -3,6 +3,7 @@
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Transforms;
namespace osu.Game.Users.Drawables namespace osu.Game.Users.Drawables
{ {
@ -23,17 +24,14 @@ namespace osu.Game.Users.Drawables
/// </summary> /// </summary>
public bool ShowPlaceholderOnNull = true; public bool ShowPlaceholderOnNull = true;
public UpdateableFlag(Country country = null, bool transformImmediately = false) public UpdateableFlag(Country country = null, bool hideImmediately = false)
{ {
TransformImmediately = hideImmediately;
Country = country; Country = country;
if (transformImmediately)
{
TransformDuration = 0;
TransformImmediately = true;
}
} }
protected override TransformSequence<Drawable> ApplyHideTransforms(Drawable drawable) => TransformImmediately ? drawable?.FadeOut() : base.ApplyHideTransforms(drawable);
protected override Drawable CreateDrawable(Country country) protected override Drawable CreateDrawable(Country country)
{ {
if (country == null && !ShowPlaceholderOnNull) if (country == null && !ShowPlaceholderOnNull)