diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-11-19 09:29:08 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-19 09:29:08 -0800 |
| commit | 0627d550f371c26b00e802bae288a5e6def53345 (patch) | |
| tree | 8f4e740736d4fbca2eb543bb0148232e968286ef /indra/llui/lltoggleablemenu.cpp | |
| parent | 9e53ad6111ce0e15cb10f2ffb47fee8b48d1c3db (diff) | |
| parent | 51e640e5d753ac9dc005cd6827db77988a04b8fa (diff) | |
Automated merge with ssh://rick@hg.lindenlab.com/rick/viewer-2-0-rickcallum/
Diffstat (limited to 'indra/llui/lltoggleablemenu.cpp')
| -rw-r--r-- | indra/llui/lltoggleablemenu.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/llui/lltoggleablemenu.cpp b/indra/llui/lltoggleablemenu.cpp index 717e135412..5df1d35383 100644 --- a/indra/llui/lltoggleablemenu.cpp +++ b/indra/llui/lltoggleablemenu.cpp @@ -40,6 +40,7 @@ static LLDefaultChildRegistry::Register<LLToggleableMenu> r("toggleable_menu"); LLToggleableMenu::LLToggleableMenu(const LLToggleableMenu::Params& p) : LLMenuGL(p), + mButtonRect(), mClosedByButtonClick(false) { } @@ -56,13 +57,19 @@ void LLToggleableMenu::handleVisibilityChange (BOOL curVisibilityIn) } } -void LLToggleableMenu::setButtonRect(const LLRect& rect, LLView* current_view) +void LLToggleableMenu::setButtonRect(const LLRect& rect, LLView* current_view) { LLRect screen; current_view->localRectToScreen(rect, &screen); mButtonRect = screen; } +void LLToggleableMenu::setButtonRect(LLView* current_view) +{ + LLRect rect = current_view->getLocalRect(); + setButtonRect(rect, current_view); +} + bool LLToggleableMenu::toggleVisibility() { if (mClosedByButtonClick) |