STORM-1879: Inventory gear menu remains on screen after floater is closed
Review Request #588 - Created June 24, 2012 and submitted
| MartinRJ Fayray | Reviewers | ||
| 3.3.3 | viewer | ||
| STORM-1879 | |||
| None | viewer-release | ||
Hide menus when the closed floater has focus. Added a check whether a "VisibilityChange"-action was triggered via shortcut. Repository: https://bitbucket.org/MartinRJ/storm-1879
See test plan in JIRA: https://jira.secondlife.com/browse/STORM-1879
Expand changes
Hide Extra Whitespace| indra/llui/llfloater.cpp | |||
|---|---|---|---|
| Diff Revision 1 | Diff Revision 2 | ||
| ... | 740 lines hidden [Expand] | ||
void LLFloater::closeFloater(bool app_quitting) |
|||
| 741 | 741 | ||
| 742 |
// give focus to dependee floater if it exists, and we had focus first |
742 |
// give focus to dependee floater if it exists, and we had focus first |
| 743 |
if (isDependent()) |
743 |
if (isDependent()) |
| 744 |
{ |
744 |
{ |
| 745 |
LLFloater* dependee = mDependeeHandle.get(); |
745 |
LLFloater* dependee = mDependeeHandle.get(); |
| 746 |
if (dependee && !dependee->isDead()) |
746 |
if (dependee && !dependee->isDead()) |
| 747 |
{ |
747 |
{ |
| 748 |
dependee->setFocus(TRUE); |
748 |
dependee->setFocus(TRUE); |
| 749 |
} |
749 |
} |
| 750 |
} |
750 |
} |
| 751 | 751 | // With focus, treat the closeFloater- call like a click on the close-button |
|
| 752 | // STORM-1879: since this floater has focus, treat the closeFloater- call |
752 | // and close gear- and contextmenus. |
| 753 |
// like a click on the close-button, and close gear- and contextmenus |
||
| 754 |
LLMenuGL::sMenuContainer->hideMenus(); |
753 |
LLMenuGL::sMenuContainer->hideMenus(); |
| 755 |
} |
754 |
} |
| 756 | 755 | ||
| 757 |
dirtyRect(); |
756 |
dirtyRect(); |
| 758 | 757 | ||
| 759 |
// Close callbacks |
758 |
// Close callbacks |
| 760 |
onClose(app_quitting); |
759 |
onClose(app_quitting); |
| 761 |
mCloseSignal(this, LLSD(app_quitting)); |
760 |
mCloseSignal(this, LLSD(app_quitting)); |
| 762 |
|
761 |
|
| 763 |
// Hide or Destroy |
762 |
// Hide or Destroy |
| ... | 2686 lines hidden [Expand] | ||
| indra/llui/lltoggleablemenu.cpp | |
|---|---|
| Diff Revision 1 | Diff Revision 2 |
Other reviews