diff options
| author | mberezhnoy <mberezhnoy@productengine.com> | 2013-03-07 13:49:29 +0200 |
|---|---|---|
| committer | mberezhnoy <mberezhnoy@productengine.com> | 2013-03-07 13:49:29 +0200 |
| commit | 8e924c850569b8aa2d2765c6514d742f51f3392b (patch) | |
| tree | 61072fa2a969d83e12cecba3b604ccb29323141f /indra | |
| parent | 84662ce63bea0d5ff8ff8bed0b12e4162a8514a5 (diff) | |
CHUI-823 ([CHUIBUG]Triple-clicking on the scroll back button in the CHUI causes all the conversation to be selected)
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llui/lltextbase.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index 7cee9f5b46..89d9f47dc2 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -1086,7 +1086,14 @@ BOOL LLTextBase::handleRightMouseUp(S32 x, S32 y, MASK mask) BOOL LLTextBase::handleDoubleClick(S32 x, S32 y, MASK mask) { - mTripleClickTimer.setTimerExpirySec(TRIPLE_CLICK_INTERVAL); + //Don't start triple click timer if user have clicked on scrollbar + mVisibleTextRect = mScroller ? mScroller->getContentWindowRect() : getLocalRect(); + if (x >= mVisibleTextRect.mLeft && x <= mVisibleTextRect.mRight + && y >= mVisibleTextRect.mBottom && y <= mVisibleTextRect.mTop) + { + mTripleClickTimer.setTimerExpirySec(TRIPLE_CLICK_INTERVAL); + } + LLTextSegmentPtr cur_segment = getSegmentAtLocalPos(x, y); if (cur_segment && cur_segment->handleDoubleClick(x, y, mask)) { |