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

FIRE-12333: Navigation bar Home, Forward, and Back buttons don't release focus after commit

Cinders 2013-11-25 19:53:14 -07:00
parent b26701b3c1
commit cded3b01a1
2 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
indra/newview/llnavigationbar.cpp
View File

@ -319,16 +319,22 @@ void LLNavigationBar::setupPanel()
fillSearchComboBox();
mBtnBack->setEnabled(FALSE);
mBtnBack->setClickedCallback(boost::bind(&LLNavigationBar::onBackButtonClicked, this));
// [FS:CR] FIRE-12333
//mBtnBack->setClickedCallback(boost::bind(&LLNavigationBar::onBackButtonClicked, this));
mBtnBack->setClickedCallback(boost::bind(&LLNavigationBar::onBackButtonClicked, this, _1));
mBtnBack->setHeldDownCallback(boost::bind(&LLNavigationBar::onBackOrForwardButtonHeldDown, this,_1, _2));
mBtnBack->setClickDraggingCallback(boost::bind(&LLNavigationBar::showTeleportHistoryMenu, this,_1));
mBtnForward->setEnabled(FALSE);
mBtnForward->setClickedCallback(boost::bind(&LLNavigationBar::onForwardButtonClicked, this));
// [FS:CR] FIRE-12333
//mBtnForward->setClickedCallback(boost::bind(&LLNavigationBar::onForwardButtonClicked, this));
mBtnForward->setClickedCallback(boost::bind(&LLNavigationBar::onForwardButtonClicked, this, _1));
mBtnForward->setHeldDownCallback(boost::bind(&LLNavigationBar::onBackOrForwardButtonHeldDown, this, _1, _2));
mBtnForward->setClickDraggingCallback(boost::bind(&LLNavigationBar::showTeleportHistoryMenu, this,_1));
mBtnHome->setClickedCallback(boost::bind(&LLNavigationBar::onHomeButtonClicked, this));
// [FS:CR] FIRE-12333
//mBtnHome->setClickedCallback(boost::bind(&LLNavigationBar::onHomeButtonClicked, this));
mBtnHome->setClickedCallback(boost::bind(&LLNavigationBar::onHomeButtonClicked, this, _1));
mCmbLocation->setCommitCallback(boost::bind(&LLNavigationBar::onLocationSelection, this));
@ -419,9 +425,12 @@ void LLNavigationBar::fillSearchComboBox()
// }
// </FS:Zi>
void LLNavigationBar::onBackButtonClicked()
// [FS:CR] FIRE-12333
//void LLNavigationBar::onBackButtonClicked()
void LLNavigationBar::onBackButtonClicked(LLUICtrl* ctrl)
{
LLTeleportHistory::getInstance()->goBack();
gFocusMgr.releaseFocusIfNeeded(ctrl); // [FS:CR] FIRE-12333
}
void LLNavigationBar::onBackOrForwardButtonHeldDown(LLUICtrl* ctrl, const LLSD& param)
@ -430,14 +439,20 @@ void LLNavigationBar::onBackOrForwardButtonHeldDown(LLUICtrl* ctrl, const LLSD&
showTeleportHistoryMenu(ctrl);
}
void LLNavigationBar::onForwardButtonClicked()
// [FS:CR] FIRE-12333
//void LLNavigationBar::onForwardButtonClicked()
void LLNavigationBar::onForwardButtonClicked(LLUICtrl* ctrl)
{
LLTeleportHistory::getInstance()->goForward();
gFocusMgr.releaseFocusIfNeeded(ctrl); // [FS:CR] FIRE-12333
}
void LLNavigationBar::onHomeButtonClicked()
// [FS:CR] FIRE-12333
//void LLNavigationBar::onHomeButtonClicked()
void LLNavigationBar::onHomeButtonClicked(LLUICtrl* ctrl)
{
gAgent.teleportHome();
gFocusMgr.releaseFocusIfNeeded(ctrl); // [FS:CR] FIRE-12333
}
void LLNavigationBar::onSearchCommit()

11
indra/newview/llnavigationbar.h
View File

@ -120,11 +120,16 @@ private:
// callbacks
void onTeleportHistoryMenuItemClicked(const LLSD& userdata);
void onTeleportHistoryChanged();
void onBackButtonClicked();
// [FS:CR] FIRE-12333
//void onBackButtonClicked();
void onBackButtonClicked(LLUICtrl* ctrl);
void onBackOrForwardButtonHeldDown(LLUICtrl* ctrl, const LLSD& param);
void onNavigationButtonHeldUp(LLButton* nav_button);
void onForwardButtonClicked();
void onHomeButtonClicked();
// [FS:CR] FIRE-12333
//void onForwardButtonClicked();
//void onHomeButtonClicked();
void onForwardButtonClicked(LLUICtrl* ctrl);
void onHomeButtonClicked(LLUICtrl* ctrl);
void onLocationSelection();
void onLocationPrearrange(const LLSD& data);
void onSearchCommit();