livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Little refactoring. 

Removed unused "mask" arguments from three sidetray methods.
meow-7.2.2
Andrew Dyukov 2010-09-13 18:19:59 +03:00
parent 5bb98a3954
commit 026b2abf91
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llbottomtray.cpp
View File

@ -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()->onDraggableButtonHover(screenX, screenY, mask);
LLBottomTray::getInstance()->onDraggableButtonHover(screenX, screenY);
return FALSE;
}
//virtual
@ -76,7 +76,7 @@ BOOL LLBottomtrayButton::handleMouseUp(S32 x, S32 y, MASK mask)
S32 screenX, screenY;
localPointToScreen(x, y, &screenX, &screenY);
// pass mouse up to bottomtray
LLBottomTray::getInstance()->onDraggableButtonMouseUp(this,screenX, screenY, mask);
LLBottomTray::getInstance()->onDraggableButtonMouseUp(this, screenX, screenY);
LLButton::handleMouseUp(x, y, mask);
return FALSE;
}
@ -86,7 +86,7 @@ BOOL LLBottomtrayButton::handleMouseDown(S32 x, S32 y, MASK mask)
S32 screenX, screenY;
localPointToScreen(x, y, &screenX, &screenY);
// pass mouse up to bottomtray
LLBottomTray::getInstance()->onDraggableButtonMouseDown(this,screenX, screenY, mask);
LLBottomTray::getInstance()->onDraggableButtonMouseDown(this, screenX, screenY);
LLButton::handleMouseDown(x, y, mask);
return FALSE;
}
@ -561,7 +561,7 @@ BOOL LLBottomTray::postBuild()
//Drag-n-drop
void LLBottomTray::onDraggableButtonMouseDown(LLUICtrl* ctrl, S32 x, S32 y, MASK mask)
void LLBottomTray::onDraggableButtonMouseDown(LLUICtrl* ctrl, S32 x, S32 y)
{
if (ctrl == NULL) return;
LLView* parent_view = ctrl->getParent();
@ -607,7 +607,7 @@ LLPanel* LLBottomTray::findChildPanelByLocalCoords(S32 x, S32 y)
return ctrl;
}
void LLBottomTray::onDraggableButtonHover(S32 x, S32 y, MASK mask)
void LLBottomTray::onDraggableButtonHover(S32 x, S32 y)
{
// if mouse down on draggable item was done, check whether we should start DnD
if (mCheckForDrag)
@ -765,7 +765,7 @@ void LLBottomTray::loadButtonsOrder()
mToolbarStack->movePanel(mNearbyChatBar, NULL, true);
}
void LLBottomTray::onDraggableButtonMouseUp(LLUICtrl* ctrl, S32 x, S32 y, MASK mask)
void LLBottomTray::onDraggableButtonMouseUp(LLUICtrl* ctrl, S32 x, S32 y)
{
//if mouse up happened over area where drop is possible, change order of buttons
if (mLandingTab != NULL && mDraggedItem != NULL && mDragStarted)

6
indra/newview/llbottomtray.h
View File

@ -134,9 +134,9 @@ public:
* 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.
*/
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);
void onDraggableButtonHover(S32 x, S32 y);
void onDraggableButtonMouseDown(LLUICtrl* button, S32 x, S32 y);
void onDraggableButtonMouseUp(LLUICtrl* button, S32 x, S32 y);
private: