sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-19 12:37:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Colour -> GetAppropriateColour, adjust status change transition

Browse Source
This commit is contained in:
DrabWeb 2017-05-22 12:37:19 -03:00
parent 62ca76bc41
commit 35814e47e4
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Users/UserPanel.cs
View File

@ -78,7 +78,7 @@ namespace osu.Game.Users
new Container new Container
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Margin = new MarginPadding { Left = height - status_height - content_padding }, Padding = new MarginPadding { Left = height - status_height - content_padding },
Children = new Drawable[] Children = new Drawable[]
{ {
new OsuSpriteText new OsuSpriteText
@ -179,7 +179,7 @@ namespace osu.Game.Users
private void displayStatus(UserStatus status) private void displayStatus(UserStatus status)
{ {
statusBg.FadeColour(status.Colour(colours), 200); statusBg.FadeColour(status.GetAppropriateColour(colours), 500, EasingTypes.OutQuint);
statusMessage.Text = status.Message; statusMessage.Text = status.Message;
} }
} }

10
osu.Game/Users/UserStatus.cs
View File

@ -9,23 +9,23 @@ namespace osu.Game.Users
public abstract class UserStatus public abstract class UserStatus
{ {
public abstract string Message { get; } public abstract string Message { get; }
public abstract Color4 Colour(OsuColour colours); public abstract Color4 GetAppropriateColour(OsuColour colours);
} }
public abstract class UserStatusAvailable : UserStatus public abstract class UserStatusAvailable : UserStatus
{ {
public override Color4 Colour(OsuColour colours) => colours.BlueDarker; public override Color4 GetAppropriateColour(OsuColour colours) => colours.BlueDarker;
} }
public abstract class UserStatusBusy : UserStatus public abstract class UserStatusBusy : UserStatus
{ {
public override Color4 Colour(OsuColour colours) => colours.YellowDark; public override Color4 GetAppropriateColour(OsuColour colours) => colours.YellowDark;
} }
public class UserStatusOffline : UserStatus public class UserStatusOffline : UserStatus
{ {
public override string Message => @"Offline"; public override string Message => @"Offline";
public override Color4 Colour(OsuColour colours) => colours.Gray7; public override Color4 GetAppropriateColour(OsuColour colours) => colours.Gray7;
} }
public class UserStatusOnline : UserStatusAvailable public class UserStatusOnline : UserStatusAvailable
@ -56,6 +56,6 @@ namespace osu.Game.Users
public class UserStatusModding : UserStatus public class UserStatusModding : UserStatus
{ {
public override string Message => @"Modding a map"; public override string Message => @"Modding a map";
public override Color4 Colour(OsuColour colours) => colours.PurpleDark; public override Color4 GetAppropriateColour(OsuColour colours) => colours.PurpleDark;
} }
} }