livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

master
Richard Linden 2010-08-23 22:37:30 -07:00
parent d1294e5aeb 44e312541a
commit 4115decfa1
3 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/llui/lltooltip.cpp
View File

@ -84,9 +84,9 @@ BOOL LLToolTipView::handleHover(S32 x, S32 y, MASK mask)
LLToolTipMgr& tooltip_mgr = LLToolTipMgr::instance();
if (x != last_x && y != last_y)
if (x != last_x && y != last_y && !tooltip_mgr.getMouseNearRect().pointInRect(x, y))
{
// allow new tooltips because mouse moved
// allow new tooltips because mouse moved outside of mouse near rect
tooltip_mgr.unblockToolTips();
}
@ -586,6 +586,7 @@ void LLToolTipMgr::updateToolTipVisibility()
if (mToolTip->getVisibleTime() > tooltip_timeout)
{
hideToolTips();
unblockToolTips();
}
}
}

19
indra/newview/llfavoritesbar.cpp
View File

@ -167,22 +167,13 @@ public:
if (!region_name.empty())
{
LLToolTip::Params params;
std::string extra_message = llformat("%s (%d, %d, %d)", region_name.c_str(),
mLandmarkInfoGetter.getPosX(), mLandmarkInfoGetter.getPosY(), mLandmarkInfoGetter.getPosZ());
LLToolTip::Params params;
params.message = llformat("%s\n%s", getLabelSelected().c_str(), extra_message.c_str());
LLRect rect = calcScreenRect();
LLFontGL* standart_font = LLFontGL::getFontSansSerif();
if(standart_font)
{
S32 w = llmax((S32)(standart_font->getWidthF32(getLabelSelected())+0.5),(S32)(standart_font->getWidthF32(extra_message)+0.5));
rect.mRight = rect.mLeft + w;
params.max_width = w;
}
params.sticky_rect = rect;
params.max_width = 1000;
params.sticky_rect = calcScreenRect();
LLToolTipMgr::instance().show(params);
}
@ -676,9 +667,9 @@ const LLButton::Params& LLFavoritesBarCtrl::getButtonParams()
{
LLXMLNodePtr button_xml_node;
if(LLUICtrlFactory::getLayeredXMLNode("favorites_bar_button.xml", button_xml_node))
{
{
LLXUIParser::instance().readXUI(button_xml_node, button_params, "favorites_bar_button.xml");
}
}
params_initialized = true;
}

2
indra/newview/llhints.cpp
View File

@ -297,7 +297,7 @@ void LLHints::show(LLNotificationPtr hint)
{
LLHintPopup::Params p(LLUICtrlFactory::getDefaultParams<LLHintPopup>());
LLParamSDParser::instance().readSD(hint->getPayload(), p);
LLParamSDParser::instance().readSD(hint->getPayload(), p, true);
p.notification = hint;
if (p.validateBlock())