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

EXP-1822 FIXED (After deleting an item from inventory and confirming "ok" to delete, focus leaves inventory) 

- Return focus to the previously focused root view
master
paulgproductengine 2012-02-09 23:34:12 +02:00
parent ed137f40d1
commit ca80e17e90
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/lltoastalertpanel.cpp
View File

@ -73,9 +73,14 @@ LLToastAlertPanel::LLToastAlertPanel( LLNotificationPtr notification, bool modal
// save currently focused view, so that return focus to it
// on destroying this toast.
LLView* current_selection = dynamic_cast<LLView*>(gFocusMgr.getKeyboardFocus());
if (current_selection)
while(current_selection)
{
mPreviouslyFocusedView = current_selection->getHandle();
if (current_selection->isFocusRoot())
{
mPreviouslyFocusedView = current_selection->getHandle();
break;
}
current_selection = current_selection->getParent();
}
const LLFontGL* font = LLFontGL::getFontSansSerif();
@ -422,7 +427,7 @@ LLToastAlertPanel::~LLToastAlertPanel()
// return focus to the previously focused view
if (mPreviouslyFocusedView.get())
{
gFocusMgr.setKeyboardFocus(mPreviouslyFocusedView.get());
mPreviouslyFocusedView.get()->setFocus(TRUE);
}
}