diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-17 10:53:10 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-17 10:53:10 +0100 |
| commit | acfb50f61c04b12c8df4420c943b6cc9242eb7e9 (patch) | |
| tree | 801682aaa0cca47de6dc2978db71422476ca39fc /indra/newview/llinventoryitemslist.cpp | |
| parent | 599a9a97b42626f2e45d4a9bf8e2dc297b3c31b1 (diff) | |
| parent | 9eeaaf67387377fcf552be7cae5191df338f5a1e (diff) | |
merge from PE's viewer-release
Diffstat (limited to 'indra/newview/llinventoryitemslist.cpp')
| -rw-r--r-- | indra/newview/llinventoryitemslist.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/indra/newview/llinventoryitemslist.cpp b/indra/newview/llinventoryitemslist.cpp index 23ea786484..c4efd70385 100644 --- a/indra/newview/llinventoryitemslist.cpp +++ b/indra/newview/llinventoryitemslist.cpp @@ -288,11 +288,23 @@ void LLPanelInventoryListItemBase::setIconImage(const LLUIImagePtr& image) void LLPanelInventoryListItemBase::setTitle(const std::string& title, const std::string& highlit_text) { + setToolTip(title);
+ LLTextUtil::textboxSetHighlightedVal( mTitleCtrl, LLStyle::Params(), title, - highlit_text); + highlit_text);
+} + +BOOL LLPanelInventoryListItemBase::handleToolTip( S32 x, S32 y, MASK mask)
+{
+ LLTextBox* item_name = getChild<LLTextBox>("item_name");
+ if (item_name->getRect().getWidth() < item_name->getTextPixelWidth())
+ {
+ return LLPanel::handleToolTip(x,y,mask);
+ }
+ return FALSE;
} void LLPanelInventoryListItemBase::reshapeLeftWidgets() |