1
0
mirror of https://github.com/ppy/osu.git synced 2025-02-16 13:42:56 +08:00

Refactor UserPanel status display logic

This commit is contained in:
Lucas A 2019-06-11 20:00:14 +02:00
parent 15893bbb75
commit 51d428ef94

View File

@ -231,18 +231,19 @@ namespace osu.Game.Users
statusBar.ResizeHeightTo(status_height, transition_duration, Easing.OutQuint); statusBar.ResizeHeightTo(status_height, transition_duration, Easing.OutQuint);
statusBar.FadeIn(transition_duration, Easing.OutQuint); statusBar.FadeIn(transition_duration, Easing.OutQuint);
this.ResizeHeightTo(height, transition_duration, Easing.OutQuint); this.ResizeHeightTo(height, transition_duration, Easing.OutQuint);
}
if (status is UserStatusOnline && activity != null) if (status is UserStatusOnline && activity != null)
{ {
statusMessage.Text = activity.Status; statusMessage.Text = activity.Status;
statusBg.FadeColour(activity.GetAppropriateColour(colours), 500, Easing.OutQuint); statusBg.FadeColour(activity.GetAppropriateColour(colours), 500, Easing.OutQuint);
return;
} }
} else
{
statusMessage.Text = status?.Message; statusMessage.Text = status?.Message;
statusBg.FadeColour(status?.GetAppropriateColour(colours) ?? colours.Gray5, 500, Easing.OutQuint); statusBg.FadeColour(status?.GetAppropriateColour(colours) ?? colours.Gray5, 500, Easing.OutQuint);
} }
}
public MenuItem[] ContextMenuItems => new MenuItem[] public MenuItem[] ContextMenuItems => new MenuItem[]
{ {