diff options
author | Merov Linden <merov@lindenlab.com> | 2011-02-11 17:40:48 -0800 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2011-02-11 17:40:48 -0800 |
commit | 58d8b666c207be3eafa08a4650b8351ecc6a040e (patch) | |
tree | 15f6b82217c5270905ba3485e4f6f9385c30b97a | |
parent | 924be3f25c2fca57a8d6f5f902eaeca5c2dd91e1 (diff) | |
parent | 65e88ce61de6613d8c03bbc49e0605629ff74d9f (diff) |
STORM-833 : pull into viewer-development
-rw-r--r-- | indra/newview/llnamelistctrl.cpp | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/indra/newview/llnamelistctrl.cpp b/indra/newview/llnamelistctrl.cpp index 38100aa6c5..afceb58ccf 100644 --- a/indra/newview/llnamelistctrl.cpp +++ b/indra/newview/llnamelistctrl.cpp @@ -143,6 +143,30 @@ void LLNameListCtrl::mouseOverHighlightNthItem( S32 target_index ) S32 cur_index = getHighlightedItemInx(); if (cur_index != target_index) { + bool is_mouse_over_name_cell = false; + + S32 mouse_x, mouse_y; + LLUI::getMousePositionLocal(this, &mouse_x, &mouse_y); + + S32 column_index = getColumnIndexFromOffset(mouse_x); + LLScrollListItem* hit_item = hitItem(mouse_x, mouse_y); + if (hit_item && column_index == mNameColumnIndex) + { + // Get the name cell which is currently under the mouse pointer. + LLScrollListCell* hit_cell = hit_item->getColumn(column_index); + if (hit_cell) + { + is_mouse_over_name_cell = getCellRect(cur_index, column_index).pointInRect(mouse_x, mouse_y); + } + } + + // If the tool tip is visible and the mouse is over the currently highlighted item's name cell, + // we should not reset the highlighted item index i.e. set mHighlightedItem = -1 + // and should not increase the width of the text inside the cell because it may + // overlap the tool tip icon. + if (LLToolTipMgr::getInstance()->toolTipVisible() && is_mouse_over_name_cell) + return; + if(0 <= cur_index && cur_index < (S32)getItemList().size()) { LLScrollListItem* item = getItemList()[cur_index]; |