diff options
| author | Richard Linden <none@none> | 2011-09-27 15:53:38 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-09-27 15:53:38 -0700 |
| commit | 8912a9bef62386e5eecaa61ba9079d507ae16d90 (patch) | |
| tree | 5727a3e82786dc5f39d6962a462330ee02188d97 /indra/llui/lltoolbar.cpp | |
| parent | f0095ddd23b46932ba0aef6bf62918c816ebb09c (diff) | |
EXP-1258 WIP toggle buttons between icons and icons+text modes
better button sizing
also disabled context menu for non-toolbar region
Diffstat (limited to 'indra/llui/lltoolbar.cpp')
| -rw-r--r-- | indra/llui/lltoolbar.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llui/lltoolbar.cpp b/indra/llui/lltoolbar.cpp index 0c3052b1ab..9ca5a0f480 100644 --- a/indra/llui/lltoolbar.cpp +++ b/indra/llui/lltoolbar.cpp @@ -247,7 +247,9 @@ bool LLToolBar::enableCommand(const LLCommandId& commandId, bool enabled) BOOL LLToolBar::handleRightMouseDown(S32 x, S32 y, MASK mask) { - BOOL handle_it_here = !mReadOnly; + LLRect button_panel_rect; + mButtonPanel->localRectToOtherView(mButtonPanel->getLocalRect(), &button_panel_rect, this); + BOOL handle_it_here = !mReadOnly && button_panel_rect.pointInRect(x, y); if (handle_it_here) { |