Skip to content
Snippets Groups Projects
Commit c7bca460 authored by Vadim ProductEngine's avatar Vadim ProductEngine
Browse files

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.
parent 94687fd0
No related branches found
No related tags found
No related merge requests found
...@@ -1093,7 +1093,7 @@ class LLTextureFetchDescendentsObserver : public LLInventoryFetchDescendentsObse ...@@ -1093,7 +1093,7 @@ class LLTextureFetchDescendentsObserver : public LLInventoryFetchDescendentsObse
BOOL LLTextureCtrl::handleHover(S32 x, S32 y, MASK mask) 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; return TRUE;
} }
...@@ -1102,7 +1102,7 @@ BOOL LLTextureCtrl::handleMouseDown(S32 x, S32 y, MASK mask) ...@@ -1102,7 +1102,7 @@ BOOL LLTextureCtrl::handleMouseDown(S32 x, S32 y, MASK mask)
{ {
BOOL handled = LLUICtrl::handleMouseDown( x, y , mask ); BOOL handled = LLUICtrl::handleMouseDown( x, y , mask );
if( !handled ) if (!handled && mBorder->parentPointInView(x, y))
{ {
showPicker(FALSE); showPicker(FALSE);
//grab textures first... //grab textures first...
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment