Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add modes text to groups tooltip #22340

Merged
merged 6 commits into from
Jan 22, 2023
Merged

Add modes text to groups tooltip #22340

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
05f77d2
Add modes text to groups tooltip
EXtremeExploit Jan 22, 2023
8c208da
Cleanup
EXtremeExploit Jan 22, 2023
2f3971b
Move code to already existing if block
EXtremeExploit Jan 22, 2023
b98da50
Fix code quality inspection
bdach Jan 22, 2023
9bde1ef
Privatise setter
bdach Jan 22, 2023
e1acf85
Merge branch 'master' into groups-modes
bdach Jan 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Add modes text to groups tooltip
  • Loading branch information
@EXtremeExploit
EXtremeExploit committed Jan 22, 2023
commit 05f77d2cabfa19201b98ee26f911261bf916642a
1 change: 1 addition & 0 deletions osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ public void TestLoading()
Groups = new[]
{
new APIUserGroup { Colour = "#EB47D0", ShortName = "DEV", Name = "Developers" },
new APIUserGroup { Colour = "#A347EB", ShortName = "BN", Name = "Beatmap Nominators", Playmodes = new[] { "mania" } },
new APIUserGroup { Colour = "#A347EB", ShortName = "BN", Name = "Beatmap Nominators", Playmodes = new[] { "osu", "taiko" } }
},
ProfileOrder = new[]
Expand Down
12 changes: 11 additions & 1 deletion osu.Game/Overlays/Profile/Header/Components/GroupBadge.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
{
public partial class GroupBadge : Container, IHasTooltip
{
public LocalisableString TooltipText { get; }
public LocalisableString TooltipText { get; set; }

public int TextSize { get; set; } = 12;

Expand All @@ -34,7 +34,9 @@ public GroupBadge(APIUserGroup group)
Masking = true;
CornerRadius = 8;


TooltipText = group.Name;

}

[BackgroundDependencyLoader]
Expand Down Expand Up @@ -79,6 +81,14 @@ private void load(OverlayColourProvider? colourProvider, RulesetStore rulesets)
})).ToList()
);
}

if (group.Playmodes?.Length > 0)
{
var badgeModesList = group.Playmodes.Select(p => rulesets.GetRuleset(p)?.Name).ToList();

string modesDisplay = string.Join(", ", badgeModesList);
this.TooltipText += $" ({modesDisplay})";
}
}
}
}