diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-02-19 21:42:32 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-02-19 21:42:32 +0000 |
| commit | 2e32d44e7165775936beae5d9ef636ff9d3f2bd2 (patch) | |
| tree | 8153bc399994aabf6e1c41c2d8332e4e8c4ddb78 /indra/llui/llresizehandle.cpp | |
| parent | db0f5847ea8b96b3c1ac08e7aeb43d83daacb8e4 (diff) | |
merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release.
QAR-290 = QAR-271 + QAR-191
Diffstat (limited to 'indra/llui/llresizehandle.cpp')
| -rw-r--r-- | indra/llui/llresizehandle.cpp | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/indra/llui/llresizehandle.cpp b/indra/llui/llresizehandle.cpp index 120323e7d1..36028a4513 100644 --- a/indra/llui/llresizehandle.cpp +++ b/indra/llui/llresizehandle.cpp @@ -75,23 +75,13 @@ LLResizeHandle::LLResizeHandle( const LLString& name, const LLRect& rect, S32 mi setSaveToXML(FALSE); } -EWidgetType LLResizeHandle::getWidgetType() const -{ - return WIDGET_TYPE_RESIZE_HANDLE; -} - -LLString LLResizeHandle::getWidgetTag() const -{ - return LL_RESIZE_HANDLE_TAG; -} - BOOL LLResizeHandle::handleMouseDown(S32 x, S32 y, MASK mask) { BOOL handled = FALSE; if( getVisible() && pointInHandle(x, y) ) { handled = TRUE; - if( mEnabled ) + if( getEnabled() ) { // Route future Mouse messages here preemptively. (Release on mouse up.) // No handler needed for focus lost since this clas has no state that depends on it. @@ -292,10 +282,12 @@ BOOL LLResizeHandle::handleHover(S32 x, S32 y, MASK mask) handled = TRUE; } - else - if( getVisible() && pointInHandle( x, y ) ) + else // don't have mouse capture { - handled = TRUE; + if( getVisible() && pointInHandle( x, y ) ) + { + handled = TRUE; + } } if( handled ) @@ -314,7 +306,8 @@ BOOL LLResizeHandle::handleHover(S32 x, S32 y, MASK mask) } return handled; -} +} // end handleHover + // assumes GL state is set for 2D void LLResizeHandle::draw() @@ -330,8 +323,8 @@ BOOL LLResizeHandle::pointInHandle( S32 x, S32 y ) { if( pointInView(x, y) ) { - const S32 TOP_BORDER = (mRect.getHeight() - RESIZE_BORDER_WIDTH); - const S32 RIGHT_BORDER = (mRect.getWidth() - RESIZE_BORDER_WIDTH); + const S32 TOP_BORDER = (getRect().getHeight() - RESIZE_BORDER_WIDTH); + const S32 RIGHT_BORDER = (getRect().getWidth() - RESIZE_BORDER_WIDTH); switch( mCorner ) { |