Skip to content

feat(TeamParticipants): improve ingame role display for roles without icon #7494

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

Open
hjpalpha wants to merge 4 commits into
base: main
Choose a base branch
from
+6 −4
Open

feat(TeamParticipants): improve ingame role display for roles without icon #7494

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dbce654
feat(TeamParticipants): display ingame roles only on left if they hav…
hjpalpha May 12, 2026
f5872f7
adjust comment
hjpalpha May 12, 2026
8546b87
Update lua/wikis/commons/Widget/Participants/Team/Roster.lua
hjpalpha May 12, 2026
9e798f1
Merge branch 'main' into ingame-role-without-icon-improvement-in-team…
hjpalpha May 13, 2026
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
10 changes: 6 additions & 4 deletions lua/wikis/commons/Widget/Participants/Team/Roster.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,11 @@ end
-- * Right-role:
-- * If the person has a specific status (did not play/former), display it first
-- * If there's a non-ingame role assigned, display it after the status
-- * Displays the remaining ingame roles (which are not displayed on the left) also.
-- * Returns an array of labels to display (can be multiple)
-- * Left-role:
-- * If the first role has an icon, we use that to render the left-role
-- * If not then we instead display the icon or text of the first ingame role
-- * If not then we instead display the icon of the first ingame role with icon
---@param player table
---@return string?, string[]?
local function getRoleDisplays(player)
Expand All @@ -69,8 +70,8 @@ local function getRoleDisplays(player)
return firstRole.icon
end
for _, role in ipairs(roles) do
if role.type == RoleUtil.ROLE_TYPE.INGAME then
return role.icon or role.display
if role.type == RoleUtil.ROLE_TYPE.INGAME and role.icon then
return role.icon
end
end
end
Expand All @@ -84,7 +85,7 @@ local function getRoleDisplays(player)
end
-- Add non-ingame role if present
for _, role in ipairs(roles) do
if role.type ~= RoleUtil.ROLE_TYPE.INGAME then
if role.type ~= RoleUtil.ROLE_TYPE.INGAME or not role.icon then
table.insert(rightRoles, role.display)
break
end
Expand Down Expand Up @@ -138,6 +139,7 @@ function ParticipantsTeamRoster:render()
end

---@param groups {label: string?, players: table[]}[]
---@return Widget
local makeRostersDisplay = function(groups)
local children = {}
for _, group in ipairs(groups) do
Expand Down
Loading