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

Fix tooltips being active behind popups and outside clipping rects

Browse source 
Ensure that tooltips are only activated when the associated UI element is currently the hot item. This prevents tooltips from being activated for UI elements that are currently not enabled due to them being behind a popup or outside of a clipping rect.
This commit is contained in:
Robert Müller 2023-05-29 11:22:33 +02:00
parent 57f1b1a8c6
commit bbe2430be9
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/game/client/components/tooltips.cpp
View file

@ -30,6 +30,7 @@ void CTooltips::DoToolTip(const void *pID, const CUIRect *pNearRect, const char
{ {
uintptr_t ID = reinterpret_cast<uintptr_t>(pID); uintptr_t ID = reinterpret_cast<uintptr_t>(pID);
const auto result = m_Tooltips.emplace(ID, CTooltip{ const auto result = m_Tooltips.emplace(ID, CTooltip{
pID,
*pNearRect, *pNearRect,
pText, pText,
WidthHint, WidthHint,
@ -44,7 +45,7 @@ void CTooltips::DoToolTip(const void *pID, const CUIRect *pNearRect, const char
Tooltip.m_OnScreen = true; Tooltip.m_OnScreen = true;
if(UI()->MouseInside(&Tooltip.m_Rect)) if(UI()->HotItem() == Tooltip.m_pID)
{ {
SetActiveTooltip(Tooltip); SetActiveTooltip(Tooltip);
} }
@ -56,7 +57,7 @@ void CTooltips::OnRender()
{ {
CTooltip &Tooltip = m_ActiveTooltip.value(); CTooltip &Tooltip = m_ActiveTooltip.value();
if(!UI()->MouseInside(&Tooltip.m_Rect)) if(UI()->HotItem() != Tooltip.m_pID)
{ {
Tooltip.m_OnScreen = false; Tooltip.m_OnScreen = false;
ClearActiveTooltip(); ClearActiveTooltip();

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

@ -11,6 +11,7 @@
struct CTooltip struct CTooltip
{ {
const void *m_pID;
CUIRect m_Rect; CUIRect m_Rect;
const char *m_pText; const char *m_pText;
float m_WidthHint; float m_WidthHint;