diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-09 16:33:58 +0000 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-09 16:33:58 +0000 |
commit | d1efc0fd52c0e5dc59951f50435e121305fe9b69 (patch) | |
tree | 7ac48a54efc4029b44a6743b08d351ecfd947801 /indra/newview/llinspect.cpp | |
parent | 4d9bcc2c8f303464c3664a0a7304a1bc2d658e2e (diff) | |
parent | c9b27bec33d601330afe854d0322d22fce9da76a (diff) |
merge from viewer2 trunk.
Diffstat (limited to 'indra/newview/llinspect.cpp')
-rw-r--r-- | indra/newview/llinspect.cpp | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/indra/newview/llinspect.cpp b/indra/newview/llinspect.cpp index c7b651f37c..81cfce53b1 100644 --- a/indra/newview/llinspect.cpp +++ b/indra/newview/llinspect.cpp @@ -32,6 +32,7 @@ #include "llinspect.h" +#include "lltooltip.h" #include "llcontrol.h" // LLCachedControl #include "llui.h" // LLUI::sSettingsGroups #include "llviewermenu.h" @@ -104,6 +105,26 @@ BOOL LLInspect::handleHover(S32 x, S32 y, MASK mask) return LLView::handleHover(x, y, mask); } +BOOL LLInspect::handleToolTip(S32 x, S32 y, MASK mask) +{ + BOOL handled = FALSE; + + + //delegate handling of tooltip to the hovered child + LLView* child_handler = childFromPoint(x,y); + if (child_handler && !child_handler->getToolTip().empty())// show tooltip if a view has non-empty tooltip message + { + //build LLInspector params to get correct tooltip setting, etc. background image + LLInspector::Params params; + params.fillFrom(LLUICtrlFactory::instance().getDefaultParams<LLInspector>()); + params.message = child_handler->getToolTip(); + //set up delay if there is no visible tooltip at this moment + params.delay_time = LLToolTipMgr::instance().toolTipVisible() ? 0.f : LLUI::sSettingGroups["config"]->getF32( "ToolTipDelay" ); + LLToolTipMgr::instance().show(params); + handled = TRUE; + } + return handled; +} // virtual void LLInspect::onMouseLeave(S32 x, S32 y, MASK mask) { |