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

STORM-1305 WIP Fixed texture control to not display hand cursor outside of the texture. 

Also click outside of the texture will not show the picker anymore.
master
Vadim ProductEngine 2011-06-22 21:14:38 +03:00
parent 94687fd05e
commit c7bca4602e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/lltexturectrl.cpp
View File

@ -1093,7 +1093,7 @@ public:
BOOL LLTextureCtrl::handleHover(S32 x, S32 y, MASK mask)
{
getWindow()->setCursor(UI_CURSOR_HAND);
getWindow()->setCursor(mBorder->parentPointInView(x,y) ? UI_CURSOR_HAND : UI_CURSOR_ARROW);
return TRUE;
}
@ -1102,7 +1102,7 @@ BOOL LLTextureCtrl::handleMouseDown(S32 x, S32 y, MASK mask)
{
BOOL handled = LLUICtrl::handleMouseDown( x, y , mask );
if( !handled )
if (!handled && mBorder->parentPointInView(x, y))
{
showPicker(FALSE);
//grab textures first...