diff options
| author | Andrew Dyukov <adyukov@productengine.com> | 2010-09-13 18:06:12 +0300 |
|---|---|---|
| committer | Andrew Dyukov <adyukov@productengine.com> | 2010-09-13 18:06:12 +0300 |
| commit | 5bb98a395482927a5dbe68cb6888b0b116ffea67 (patch) | |
| tree | e9a69f6d59496d88b17dbd90c96bf1c854a0ded2 | |
| parent | 807aec7bafe19fca75a8f3980bd621fad7c8338e (diff) | |
STORM-123 FIXED Fixed resize availability of nearby chat in bottomtray.
Cursor didn't change to "resize" state, because handlehover of bottomtray wasn't working correctly. It happened
because LLPanel::handleHover() wasn't called in LLBottomtray::handleHover().
- There was no good reason to override habdleHover() in LLBottomTray so new method onDraggableButtonHover() was introduced to be called
from bottomtray buttons(as it was already done for mouse up and down).
| -rw-r--r-- | indra/newview/llbottomtray.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/llbottomtray.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp index f3ade83d00..d7a38d39cb 100644 --- a/indra/newview/llbottomtray.cpp +++ b/indra/newview/llbottomtray.cpp @@ -67,7 +67,7 @@ BOOL LLBottomtrayButton::handleHover(S32 x, S32 y, MASK mask) S32 screenX, screenY; localPointToScreen(x, y, &screenX, &screenY); // pass hover to bottomtray - LLBottomTray::getInstance()->handleHover(screenX, screenY, mask); + LLBottomTray::getInstance()->onDraggableButtonHover(screenX, screenY, mask); return FALSE; } //virtual @@ -607,7 +607,7 @@ LLPanel* LLBottomTray::findChildPanelByLocalCoords(S32 x, S32 y) return ctrl; } -BOOL LLBottomTray::handleHover(S32 x, S32 y, MASK mask) +void LLBottomTray::onDraggableButtonHover(S32 x, S32 y, MASK mask) { // if mouse down on draggable item was done, check whether we should start DnD if (mCheckForDrag) @@ -634,8 +634,6 @@ BOOL LLBottomTray::handleHover(S32 x, S32 y, MASK mask) gViewerWindow->getWindow()->setCursor(UI_CURSOR_NO); } } - - return TRUE; } bool LLBottomTray::isCursorOverDraggableArea(S32 x, S32 y) diff --git a/indra/newview/llbottomtray.h b/indra/newview/llbottomtray.h index 14a29895f5..700debb4a0 100644 --- a/indra/newview/llbottomtray.h +++ b/indra/newview/llbottomtray.h @@ -131,8 +131,10 @@ public: /** * These three methods handle drag'n'drop, they may be called directly from child buttons. + * handleHover and other virtual handle* couldn't be used here, because we should call LLPanel::handle*, + * but x and y here are often outside of bottomtray. */ - /*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask); + void onDraggableButtonHover(S32 x, S32 y, MASK mask); void onDraggableButtonMouseDown(LLUICtrl* button, S32 x, S32 y, MASK mask); void onDraggableButtonMouseUp(LLUICtrl* button, S32 x, S32 y, MASK mask); |