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

FIRE-7209/VWR-28494: Hovering the mouse above/below the separator line doesn't highlight anything if the items above/below it are invisible 

-> right-click on the "Current Outfit" folder and hover on the separators
Kitty Barnett 2012-08-04 00:56:15 +02:00
parent 7b2a1bd4e9
commit 845f3d1f3a
1 changed files with 36 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
indra/llui/llmenugl.cpp
View File

@ -2672,21 +2672,35 @@ LLMenuItemGL* LLMenuGL::highlightNextItem(LLMenuItemGL* cur_item, BOOL skip_disa
while(1)
{
// skip separators and disabled/invisible items
if ((*next_item_iter)->getEnabled() && (*next_item_iter)->getVisible() && !dynamic_cast<LLMenuItemSeparatorGL*>(*next_item_iter))
// [SL:KB] - Patch: UI-Misc | Checked: 2012-08-03 (Catznip-3.3)
bool fCanHighlight = ((*next_item_iter)->getVisible()) && (!dynamic_cast<LLMenuItemSeparatorGL*>(*next_item_iter));
if ( (fCanHighlight) && ((*next_item_iter)->getEnabled()) )
{
if (cur_item)
{
cur_item->setHighlight(FALSE);
}
(*next_item_iter)->setHighlight(TRUE);
return (*next_item_iter);
}
if (!skip_disabled || next_item_iter == cur_item_iter)
// We always want to skip invisible items and separators so only break if it was actually disabled
if ( ((!skip_disabled) && (fCanHighlight)) || (next_item_iter == cur_item_iter) )
{
break;
}
// [/SL:KB]
// if ((*next_item_iter)->getEnabled() && (*next_item_iter)->getVisible() && !dynamic_cast<LLMenuItemSeparatorGL*>(*next_item_iter))
// {
// if (cur_item)
// {
// cur_item->setHighlight(FALSE);
// }
// (*next_item_iter)->setHighlight(TRUE);
// return (*next_item_iter);
// }
//
//
// if (!skip_disabled || next_item_iter == cur_item_iter)
// {
// break;
// }
next_item_iter++;
if (next_item_iter == mItems.end())
@ -2762,19 +2776,30 @@ LLMenuItemGL* LLMenuGL::highlightPrevItem(LLMenuItemGL* cur_item, BOOL skip_disa
while(1)
{
// skip separators and disabled/invisible items
// if ((*prev_item_iter)->getEnabled() && (*prev_item_iter)->getVisible() && (*prev_item_iter)->getName() != SEPARATOR_NAME)
// [SL:KB] - Patch: UI-Misc | Checked: 2012-08-03 (Catznip-3.3)
if ((*prev_item_iter)->getEnabled() && (*prev_item_iter)->getVisible() && !dynamic_cast<LLMenuItemSeparatorGL*>(*prev_item_iter))
// [/SL:KB]
bool fCanHighlight = ((*prev_item_iter)->getVisible()) && (!dynamic_cast<LLMenuItemSeparatorGL*>(*prev_item_iter));
if ( (fCanHighlight) && ((*prev_item_iter)->getEnabled()) )
{
(*prev_item_iter)->setHighlight(TRUE);
return (*prev_item_iter);
}
if (!skip_disabled || prev_item_iter == cur_item_iter)
// We always want to skip invisible items and separators (unless the iterator round-tripped)
if ( ((!skip_disabled) && (fCanHighlight)) || (prev_item_iter == cur_item_iter) )
{
break;
}
// [/SL:KB]
// if ((*prev_item_iter)->getEnabled() && (*prev_item_iter)->getVisible() && (*prev_item_iter)->getName() != SEPARATOR_NAME)
// {
// (*prev_item_iter)->setHighlight(TRUE);
// return (*prev_item_iter);
// }
//
// if (!skip_disabled || prev_item_iter == cur_item_iter)
// {
// break;
// }
prev_item_iter++;
if (prev_item_iter == mItems.rend())