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

Fix drawable room border colour not matching badge

Browse Source
This commit is contained in:
Bartłomiej Dach 2022-05-27 16:40:15 +02:00
parent 2f57849bcb
commit a94432f3bd
No known key found for this signature in database
GPG Key ID: BCECCD4FA41F6497
3 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
osu.Game/Graphics/OsuColour.cs
View File

@ -4,6 +4,7 @@
using System; using System;
using osu.Framework.Extensions.Color4Extensions; using osu.Framework.Extensions.Color4Extensions;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Online.Rooms;
using osu.Game.Overlays; using osu.Game.Overlays;
using osu.Game.Rulesets.Mods; using osu.Game.Rulesets.Mods;
using osu.Game.Rulesets.Scoring; using osu.Game.Rulesets.Scoring;
@ -188,6 +189,24 @@ namespace osu.Game.Graphics
} }
} }
/// <summary>
/// Retrieves the main accent colour for a <see cref="RoomCategory"/>.
/// </summary>
public Color4? ForRoomCategory(RoomCategory roomCategory)
{
switch (roomCategory)
{
case RoomCategory.Spotlight:
return Green2;
case RoomCategory.FeaturedArtist:
return Blue2;
default:
return null;
}
}
/// <summary> /// <summary>
/// Returns a foreground text colour that is supposed to contrast well with /// Returns a foreground text colour that is supposed to contrast well with
/// the supplied <paramref name="backgroundColour"/>. /// the supplied <paramref name="backgroundColour"/>.

3
osu.Game/Screens/OnlinePlay/Components/StatusColouredContainer.cs
View File

@ -30,8 +30,7 @@ namespace osu.Game.Screens.OnlinePlay.Components
{ {
status.BindValueChanged(s => status.BindValueChanged(s =>
{ {
this.FadeColour(category.Value == RoomCategory.Spotlight ? colours.Pink : s.NewValue.GetAppropriateColour(colours) this.FadeColour(colours.ForRoomCategory(category.Value) ?? s.NewValue.GetAppropriateColour(colours), transitionDuration);
, transitionDuration);
}, true); }, true);
} }
} }

14
osu.Game/Screens/OnlinePlay/Lounge/Components/RoomSpecialCategoryPill.cs
View File

@ -7,7 +7,6 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Sprites;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osu.Game.Online.Rooms;
using osuTK.Graphics; using osuTK.Graphics;
namespace osu.Game.Screens.OnlinePlay.Lounge.Components namespace osu.Game.Screens.OnlinePlay.Lounge.Components
@ -53,16 +52,9 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
{ {
text.Text = c.NewValue.GetLocalisableDescription(); text.Text = c.NewValue.GetLocalisableDescription();
switch (c.NewValue) var backgroundColour = colours.ForRoomCategory(Category.Value);
{ if (backgroundColour != null)
case RoomCategory.Spotlight: pill.Background.Colour = backgroundColour.Value;
pill.Background.Colour = colours.Green2;
break;
case RoomCategory.FeaturedArtist:
pill.Background.Colour = colours.Blue2;
break;
}
}, true); }, true);
} }
} }