MAINT-3290 FIXED Handle correctly Mouse Capture for LLTextBox.
parent
dbb67c326f
commit
04b84ce07d
|
|
@ -59,11 +59,14 @@ BOOL LLTextBox::handleMouseDown(S32 x, S32 y, MASK mask)
|
|||
}
|
||||
|
||||
if (!handled && mClickedCallback)
|
||||
{
|
||||
handled = TRUE;
|
||||
}
|
||||
|
||||
if (handled)
|
||||
{
|
||||
// Route future Mouse messages here preemptively. (Release on mouse up.)
|
||||
gFocusMgr.setMouseCapture( this );
|
||||
|
||||
handled = TRUE;
|
||||
}
|
||||
|
||||
return handled;
|
||||
|
|
@ -71,7 +74,7 @@ BOOL LLTextBox::handleMouseDown(S32 x, S32 y, MASK mask)
|
|||
|
||||
BOOL LLTextBox::handleMouseUp(S32 x, S32 y, MASK mask)
|
||||
{
|
||||
BOOL handled = FALSE;
|
||||
BOOL handled = LLTextBase::handleMouseUp(x, y, mask);
|
||||
|
||||
if (getSoundFlags() & MOUSE_UP)
|
||||
{
|
||||
|
|
@ -93,10 +96,6 @@ BOOL LLTextBox::handleMouseUp(S32 x, S32 y, MASK mask)
|
|||
handled = TRUE;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
handled = LLTextBase::handleMouseUp(x, y, mask);
|
||||
}
|
||||
|
||||
return handled;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue