edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-10-18 23:08:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9041 from bencie/tee-hover-tooltip

Browse source 
Show skin name as tooltip in friendlist and serverinfo
This commit is contained in:
Dennis Felsing 2024-09-26 01:42:00 +00:00 committed by GitHub
parent 525803a62b 7de1d3058f
commit 89474ae2b0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/game/client/components/menus.h
View file

@ -417,6 +417,7 @@ protected:
const void *ListItemId() const { return &m_aName; } const void *ListItemId() const { return &m_aName; }
const void *RemoveButtonId() const { return &m_FriendState; } const void *RemoveButtonId() const { return &m_FriendState; }
const void *CommunityTooltipId() const { return &m_IsPlayer; } const void *CommunityTooltipId() const { return &m_IsPlayer; }
const void *SkinTooltipId() const { return &m_aSkin; }
bool operator<(const CFriendItem &Other) const bool operator<(const CFriendItem &Other) const
{ {

7
src/game/client/components/menus_browser.cpp
View file

@ -1325,6 +1325,8 @@ void CMenus::RenderServerbrowserInfoScoreboard(CUIRect View, const CServerInfo *
CRenderTools::GetRenderTeeOffsetToRenderedTee(pIdleState, &TeeInfo, OffsetToMid); CRenderTools::GetRenderTeeOffsetToRenderedTee(pIdleState, &TeeInfo, OffsetToMid);
const vec2 TeeRenderPos = vec2(Skin.x + TeeInfo.m_Size / 2.0f, Skin.y + Skin.h / 2.0f + OffsetToMid.y); const vec2 TeeRenderPos = vec2(Skin.x + TeeInfo.m_Size / 2.0f, Skin.y + Skin.h / 2.0f + OffsetToMid.y);
RenderTools()->RenderTee(pIdleState, &TeeInfo, CurrentClient.m_Afk ? EMOTE_BLINK : EMOTE_NORMAL, vec2(1.0f, 0.0f), TeeRenderPos); RenderTools()->RenderTee(pIdleState, &TeeInfo, CurrentClient.m_Afk ? EMOTE_BLINK : EMOTE_NORMAL, vec2(1.0f, 0.0f), TeeRenderPos);
Ui()->DoButtonLogic(&CurrentClient.m_aSkin, 0, &Skin);
GameClient()->m_Tooltips.DoToolTip(&CurrentClient.m_aSkin, &Skin, CurrentClient.m_aSkin);
} }
// name // name
@ -1493,8 +1495,9 @@ void CMenus::RenderServerbrowserFriends(CUIRect View)
if(s_ScrollRegion.RectClipped(Rect)) if(s_ScrollRegion.RectClipped(Rect))
continue; continue;
const bool Inside = Ui()->HotItem() == Friend.ListItemId() || Ui()->HotItem() == Friend.RemoveButtonId() || Ui()->HotItem() == Friend.CommunityTooltipId(); const bool Inside = Ui()->HotItem() == Friend.ListItemId() || Ui()->HotItem() == Friend.RemoveButtonId() || Ui()->HotItem() == Friend.CommunityTooltipId() || Ui()->HotItem() == Friend.SkinTooltipId();
int ButtonResult = Ui()->DoButtonLogic(Friend.ListItemId(), 0, &Rect); int ButtonResult = Ui()->DoButtonLogic(Friend.ListItemId(), 0, &Rect);
if(Friend.ServerInfo()) if(Friend.ServerInfo())
{ {
GameClient()->m_Tooltips.DoToolTip(Friend.ListItemId(), &Rect, Localize("Click to select server. Double click to join your friend.")); GameClient()->m_Tooltips.DoToolTip(Friend.ListItemId(), &Rect, Localize("Click to select server. Double click to join your friend."));
@ -1525,6 +1528,8 @@ void CMenus::RenderServerbrowserFriends(CUIRect View)
CRenderTools::GetRenderTeeOffsetToRenderedTee(pIdleState, &TeeInfo, OffsetToMid); CRenderTools::GetRenderTeeOffsetToRenderedTee(pIdleState, &TeeInfo, OffsetToMid);
const vec2 TeeRenderPos = vec2(Skin.x + Skin.w / 2.0f, Skin.y + Skin.h * 0.55f + OffsetToMid.y); const vec2 TeeRenderPos = vec2(Skin.x + Skin.w / 2.0f, Skin.y + Skin.h * 0.55f + OffsetToMid.y);
RenderTools()->RenderTee(pIdleState, &TeeInfo, Friend.IsAfk() ? EMOTE_BLINK : EMOTE_NORMAL, vec2(1.0f, 0.0f), TeeRenderPos); RenderTools()->RenderTee(pIdleState, &TeeInfo, Friend.IsAfk() ? EMOTE_BLINK : EMOTE_NORMAL, vec2(1.0f, 0.0f), TeeRenderPos);
Ui()->DoButtonLogic(Friend.SkinTooltipId(), 0, &Skin);
GameClient()->m_Tooltips.DoToolTip(Friend.SkinTooltipId(), &Skin, Friend.Skin());
} }
Rect.HSplitTop(11.0f, &NameLabel, &ClanLabel); Rect.HSplitTop(11.0f, &NameLabel, &ClanLabel);