From 0f04222acc13802d1b16dff49e17dc52c1cfae2a Mon Sep 17 00:00:00 2001 From: Ychebotarev ProductEngine Date: Wed, 3 Mar 2010 11:43:48 +0200 Subject: fix for normal EXT-1391 Group Info: Avatar name should end with ellipsis if it doesn't fit free space --HG-- branch : product-engine --- indra/newview/llnamelistctrl.cpp | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'indra/newview/llnamelistctrl.cpp') diff --git a/indra/newview/llnamelistctrl.cpp b/indra/newview/llnamelistctrl.cpp index 114fef8712..d6073aa0d8 100644 --- a/indra/newview/llnamelistctrl.cpp +++ b/indra/newview/llnamelistctrl.cpp @@ -138,6 +138,29 @@ void LLNameListCtrl::showInspector(const LLUUID& avatar_id, bool is_group) LLFloaterReg::showInstance("inspect_avatar", LLSD().with("avatar_id", avatar_id)); } +void LLNameListCtrl::mouseOverHighlightNthItem( S32 target_index ) +{ + if (getHighlightedItemInx()!= target_index) + { + if(getHighlightedItemInx()!=-1) + { + LLScrollListItem* item = getItemList()[getHighlightedItemInx()]; + LLScrollListText* cell = dynamic_cast(item->getColumn(mNameColumnIndex)); + if(cell) + cell->setTextWidth(cell->getTextWidth() + 16); + } + if(target_index != -1) + { + LLScrollListItem* item = getItemList()[target_index]; + LLScrollListText* cell = dynamic_cast(item->getColumn(mNameColumnIndex)); + if(cell) + cell->setTextWidth(cell->getTextWidth() - 16); + } + } + + LLScrollListCtrl::mouseOverHighlightNthItem(target_index); +} + //virtual BOOL LLNameListCtrl::handleToolTip(S32 x, S32 y, MASK mask) { -- cgit v1.2.3 From 9180edf9c0d6e9d0600659709cead3ab17d6b7e3 Mon Sep 17 00:00:00 2001 From: Ychebotarev ProductEngine Date: Wed, 3 Mar 2010 12:43:39 +0200 Subject: remove hardcoded numbers --HG-- branch : product-engine --- indra/newview/llnamelistctrl.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'indra/newview/llnamelistctrl.cpp') diff --git a/indra/newview/llnamelistctrl.cpp b/indra/newview/llnamelistctrl.cpp index d6073aa0d8..883d4cdf4b 100644 --- a/indra/newview/llnamelistctrl.cpp +++ b/indra/newview/llnamelistctrl.cpp @@ -47,6 +47,8 @@ static LLDefaultChildRegistry::Register r("name_list"); +static const S32 info_icon_size = 16; + void LLNameListCtrl::NameTypeNames::declareValues() { declare("INDIVIDUAL", LLNameListCtrl::INDIVIDUAL); @@ -147,14 +149,14 @@ void LLNameListCtrl::mouseOverHighlightNthItem( S32 target_index ) LLScrollListItem* item = getItemList()[getHighlightedItemInx()]; LLScrollListText* cell = dynamic_cast(item->getColumn(mNameColumnIndex)); if(cell) - cell->setTextWidth(cell->getTextWidth() + 16); + cell->setTextWidth(cell->getTextWidth() + info_icon_size); } if(target_index != -1) { LLScrollListItem* item = getItemList()[target_index]; LLScrollListText* cell = dynamic_cast(item->getColumn(mNameColumnIndex)); if(cell) - cell->setTextWidth(cell->getTextWidth() - 16); + cell->setTextWidth(cell->getTextWidth() - info_icon_size); } } @@ -187,7 +189,7 @@ BOOL LLNameListCtrl::handleToolTip(S32 x, S32 y, MASK mask) // Spawn at right side of cell LLPointer icon = LLUI::getUIImage("Info_Small"); - LLCoordGL pos( sticky_rect.mRight - 16, sticky_rect.mTop - (sticky_rect.getHeight() - icon->getHeight())/2 ); + LLCoordGL pos( sticky_rect.mRight - info_icon_size, sticky_rect.mTop - (sticky_rect.getHeight() - icon->getHeight())/2 ); // Should we show a group or an avatar inspector? bool is_group = hit_item->getValue()["is_group"].asBoolean(); -- cgit v1.2.3