sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-07 16:43:52 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18443 from frenzibyte/fix-beatmap-badge-colouring

Browse Source 
Fix beatmap badge colours not updated inline with recent changes
This commit is contained in:
Dean Herbert
2022-05-28 10:55:07 +09:00
committed by GitHub
parent 68684f5fe7 06832a4baf
commit 3aa7e3141e
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -197,10 +197,10 @@ namespace osu.Game.Graphics
switch (roomCategory) switch (roomCategory)
{ {
case RoomCategory.Spotlight: case RoomCategory.Spotlight:
return Green2; return SpotlightColour;
case RoomCategory.FeaturedArtist: case RoomCategory.FeaturedArtist:
return Blue2; return FeaturedArtistColour;
default: default:
return null; return null;
@ -379,5 +379,8 @@ namespace osu.Game.Graphics
public readonly Color4 ChatBlue = Color4Extensions.FromHex(@"17292e"); public readonly Color4 ChatBlue = Color4Extensions.FromHex(@"17292e");
public readonly Color4 ContextMenuGray = Color4Extensions.FromHex(@"223034"); public readonly Color4 ContextMenuGray = Color4Extensions.FromHex(@"223034");
public Color4 SpotlightColour => Green2;
public Color4 FeaturedArtistColour => Blue2;
} }
} }

2
osu.Game/Overlays/BeatmapSet/FeaturedArtistBeatmapBadge.cs
View File

@ -15,7 +15,7 @@ namespace osu.Game.Overlays.BeatmapSet
private void load(OsuColour colours) private void load(OsuColour colours)
{ {
BadgeText = BeatmapsetsStrings.FeaturedArtistBadgeLabel; BadgeText = BeatmapsetsStrings.FeaturedArtistBadgeLabel;
BadgeColour = colours.Blue1; BadgeColour = colours.FeaturedArtistColour;
// todo: add linking support to allow redirecting featured artist badge to corresponding track. // todo: add linking support to allow redirecting featured artist badge to corresponding track.
} }
} }

2
osu.Game/Overlays/BeatmapSet/SpotlightBeatmapBadge.cs
View File

@ -15,7 +15,7 @@ namespace osu.Game.Overlays.BeatmapSet
private void load(OsuColour colours) private void load(OsuColour colours)
{ {
BadgeText = BeatmapsetsStrings.SpotlightBadgeLabel; BadgeText = BeatmapsetsStrings.SpotlightBadgeLabel;
BadgeColour = colours.Pink1; BadgeColour = colours.SpotlightColour;
// todo: add linking support to allow redirecting spotlight badge to https://osu.ppy.sh/wiki/en/Beatmap_Spotlights. // todo: add linking support to allow redirecting spotlight badge to https://osu.ppy.sh/wiki/en/Beatmap_Spotlights.
} }
} }