mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-09-21 20:06:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed so that you can have both types of tooltip (other-object 0 delay and pop-up non-zero delay) in the same environment. Haven't tested it that thorough, but hopefully all scenarios are covered.

Browse Source 
This was SVN commit r2545.
This commit is contained in:
Gee
2005-07-25 05:54:58 +00:00
parent f84cfcdf2a
commit b94c443037
2 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/gui/GUITooltip.cpp
+28 -1
View File
@@ -222,8 +222,13 @@ void GUITooltip::Update(IGUIObject* Nearest, CPos MousePos, CGUI* GUI)
{
// Check for movement onto a zero-delayed tooltip
if (GetTooltip(Nearest, style) && GetTooltipDelay(style, GUI)==0)
{
// Reset any previous tooltips completely
//m_Time = now + (double)GetTooltipDelay(style, GUI) / 1000.;
HideTooltip(m_PreviousTooltipName, GUI);
nextstate = ST_SHOWING;
}
}
break;
@@ -253,9 +258,31 @@ void GUITooltip::Update(IGUIObject* Nearest, CPos MousePos, CGUI* GUI)
if (Nearest != m_PreviousObject)
{
if (GetTooltip(Nearest, style))
nextstate = ST_SHOWING;
{
CStr style_old;
// If we're displaying a tooltip with no delay, then we want to
// reset so that other object that should have delay can't
// "ride this tail", it have to wait.
// Notice that this doesn't apply to when you go from one delay=0
// to another delay=0
if (GetTooltip(m_PreviousObject, style_old) && GetTooltipDelay(style_old, GUI)==0 &&
GetTooltipDelay(style, GUI)!=0)
{
HideTooltip(m_PreviousTooltipName, GUI);
nextstate = ST_IN_MOTION;
}
else
{
// Hide old scrollbar
HideTooltip(m_PreviousTooltipName, GUI);
nextstate = ST_SHOWING;
}
}
else
{
nextstate = ST_COOLING;
}
}
break;