diff options
Diffstat (limited to 'linden/indra/llui/lltabcontainervertical.cpp')
-rw-r--r-- | linden/indra/llui/lltabcontainervertical.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/linden/indra/llui/lltabcontainervertical.cpp b/linden/indra/llui/lltabcontainervertical.cpp index 121adf1..a921b4b 100644 --- a/linden/indra/llui/lltabcontainervertical.cpp +++ b/linden/indra/llui/lltabcontainervertical.cpp | |||
@@ -4,6 +4,7 @@ | |||
4 | * | 4 | * |
5 | * Copyright (c) 2001-2007, Linden Research, Inc. | 5 | * Copyright (c) 2001-2007, Linden Research, Inc. |
6 | * | 6 | * |
7 | * Second Life Viewer Source Code | ||
7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
@@ -279,7 +280,7 @@ void LLTabContainerVertical::updateMaxScrollPos() | |||
279 | 280 | ||
280 | void LLTabContainerVertical::commitHoveredButton(S32 x, S32 y) | 281 | void LLTabContainerVertical::commitHoveredButton(S32 x, S32 y) |
281 | { | 282 | { |
282 | if (gFocusMgr.getMouseCapture() == this) | 283 | if (hasMouseCapture()) |
283 | { | 284 | { |
284 | for(std::vector<LLTabTuple*>::iterator iter = mTabList.begin(); iter != mTabList.end(); ++iter) | 285 | for(std::vector<LLTabTuple*>::iterator iter = mTabList.begin(); iter != mTabList.end(); ++iter) |
285 | { | 286 | { |
@@ -473,7 +474,7 @@ BOOL LLTabContainerVertical::handleMouseDown( S32 x, S32 y, MASK mask ) | |||
473 | if( tab_rect.pointInRect( x, y ) ) | 474 | if( tab_rect.pointInRect( x, y ) ) |
474 | { | 475 | { |
475 | LLButton* tab_button = mTabList[getCurrentPanelIndex()]->mButton; | 476 | LLButton* tab_button = mTabList[getCurrentPanelIndex()]->mButton; |
476 | gFocusMgr.setMouseCapture(this, NULL); | 477 | gFocusMgr.setMouseCapture(this); |
477 | gFocusMgr.setKeyboardFocus(tab_button, NULL); | 478 | gFocusMgr.setKeyboardFocus(tab_button, NULL); |
478 | } | 479 | } |
479 | } | 480 | } |
@@ -536,7 +537,7 @@ BOOL LLTabContainerVertical::handleMouseUp( S32 x, S32 y, MASK mask ) | |||
536 | 537 | ||
537 | commitHoveredButton(x, y); | 538 | commitHoveredButton(x, y); |
538 | LLPanel* cur_panel = getCurrentPanel(); | 539 | LLPanel* cur_panel = getCurrentPanel(); |
539 | if (gFocusMgr.getMouseCapture() == this) | 540 | if (hasMouseCapture()) |
540 | { | 541 | { |
541 | if (cur_panel) | 542 | if (cur_panel) |
542 | { | 543 | { |
@@ -545,7 +546,7 @@ BOOL LLTabContainerVertical::handleMouseUp( S32 x, S32 y, MASK mask ) | |||
545 | mTabList[getCurrentPanelIndex()]->mButton->setFocus(TRUE); | 546 | mTabList[getCurrentPanelIndex()]->mButton->setFocus(TRUE); |
546 | } | 547 | } |
547 | } | 548 | } |
548 | gFocusMgr.setMouseCapture(NULL, NULL); | 549 | gFocusMgr.setMouseCapture(NULL); |
549 | } | 550 | } |
550 | 551 | ||
551 | return handled; | 552 | return handled; |