diff options
author | Jacek Antonelli | 2008-08-15 23:44:54 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:44:54 -0500 |
commit | b2afb8800bb033a04bb3ecdf0363068d56648ef1 (patch) | |
tree | 3568129b5bbddb47cd39d622b4137a8fbff4abaf /linden/indra/llui/lldraghandle.cpp | |
parent | Second Life viewer sources 1.14.0.1 (diff) | |
download | meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.zip meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.gz meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.bz2 meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.xz |
Second Life viewer sources 1.15.0.2
Diffstat (limited to 'linden/indra/llui/lldraghandle.cpp')
-rw-r--r-- | linden/indra/llui/lldraghandle.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/linden/indra/llui/lldraghandle.cpp b/linden/indra/llui/lldraghandle.cpp index 261d149..9e80c99 100644 --- a/linden/indra/llui/lldraghandle.cpp +++ b/linden/indra/llui/lldraghandle.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 |
@@ -288,7 +289,7 @@ BOOL LLDragHandle::handleMouseDown(S32 x, S32 y, MASK mask) | |||
288 | { | 289 | { |
289 | // Route future Mouse messages here preemptively. (Release on mouse up.) | 290 | // Route future Mouse messages here preemptively. (Release on mouse up.) |
290 | // No handler needed for focus lost since this clas has no state that depends on it. | 291 | // No handler needed for focus lost since this clas has no state that depends on it. |
291 | gFocusMgr.setMouseCapture(this, NULL ); | 292 | gFocusMgr.setMouseCapture(this); |
292 | 293 | ||
293 | localPointToScreen(x, y, &mDragLastScreenX, &mDragLastScreenY); | 294 | localPointToScreen(x, y, &mDragLastScreenX, &mDragLastScreenY); |
294 | mLastMouseScreenX = mDragLastScreenX; | 295 | mLastMouseScreenX = mDragLastScreenX; |
@@ -301,10 +302,10 @@ BOOL LLDragHandle::handleMouseDown(S32 x, S32 y, MASK mask) | |||
301 | 302 | ||
302 | BOOL LLDragHandle::handleMouseUp(S32 x, S32 y, MASK mask) | 303 | BOOL LLDragHandle::handleMouseUp(S32 x, S32 y, MASK mask) |
303 | { | 304 | { |
304 | if( gFocusMgr.getMouseCapture() == this ) | 305 | if( hasMouseCapture() ) |
305 | { | 306 | { |
306 | // Release the mouse | 307 | // Release the mouse |
307 | gFocusMgr.setMouseCapture( NULL, NULL ); | 308 | gFocusMgr.setMouseCapture( NULL ); |
308 | } | 309 | } |
309 | 310 | ||
310 | // Note: don't pass on to children | 311 | // Note: don't pass on to children |
@@ -317,7 +318,7 @@ BOOL LLDragHandle::handleHover(S32 x, S32 y, MASK mask) | |||
317 | BOOL handled = FALSE; | 318 | BOOL handled = FALSE; |
318 | 319 | ||
319 | // We only handle the click if the click both started and ended within us | 320 | // We only handle the click if the click both started and ended within us |
320 | if( gFocusMgr.getMouseCapture() == this ) | 321 | if( hasMouseCapture() ) |
321 | { | 322 | { |
322 | S32 screen_x; | 323 | S32 screen_x; |
323 | S32 screen_y; | 324 | S32 screen_y; |