Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Display tooltip for scrolllist when not over headers or cells

Browse Source
This commit is contained in:
Lirusaito
2013-07-16 09:42:54 -04:00
parent f05fa67786
commit 599704cf40
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
indra/llui/llscrolllistctrl.cpp
View File

@@ -1565,6 +1565,13 @@ BOOL LLScrollListCtrl::handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sti
handled = headerp->handleToolTip(x, y, msg, sticky_rect_screen);
}
// Singu Note: If all else fails, try to use our own tooltip
if (!handled)
{
msg = LLUI::sShowXUINames ? getShowNamesToolTip() : getToolTip();
handled = !msg.empty();
}
return handled;
}
@@ -2551,6 +2558,10 @@ LLView* LLScrollListCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFac
node->getAttributeBOOL("mouse_wheel_opaque", mouse_wheel_opaque);
scroll_list->mMouseWheelOpaque = mouse_wheel_opaque;
std::string tool_tip;
node->getAttributeString("tool_tip", tool_tip);
scroll_list->setToolTip(tool_tip);
LLSD columns;
S32 index = 0;
for (LLXMLNodePtr child = node->getFirstChild(); child.notNull(); child = child->getNextSibling())