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

EXP-1300 WIP Visual feedback for Drag and Drop 

removed hover highlighting of buttons when dragging over them
also updated toolbar button art to match spec
meow-7.2.2
Richard Nelson 2011-10-06 15:19:15 -07:00
parent 63b357758e
commit adeaf71e33
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
indra/llui/llbutton.cpp
View File

@ -515,15 +515,6 @@ BOOL LLButton::handleRightMouseUp(S32 x, S32 y, MASK mask)
return TRUE;
}
void LLButton::onMouseEnter(S32 x, S32 y, MASK mask)
{
LLUICtrl::onMouseEnter(x, y, mask);
if (isInEnabledChain())
mNeedsHighlight = TRUE;
}
void LLButton::onMouseLeave(S32 x, S32 y, MASK mask)
{
LLUICtrl::onMouseLeave(x, y, mask);
@ -538,6 +529,10 @@ void LLButton::setHighlight(bool b)
BOOL LLButton::handleHover(S32 x, S32 y, MASK mask)
{
if (isInEnabledChain()
&& (!gFocusMgr.getMouseCapture() || gFocusMgr.getMouseCapture() != this))
mNeedsHighlight = TRUE;
if (!childrenHandleHover(x, y, mask))
{
if (mMouseDownTimer.getStarted())

1
indra/llui/llbutton.h
View File

@ -160,7 +160,6 @@ public:
virtual void draw();
/*virtual*/ BOOL postBuild();
virtual void onMouseEnter(S32 x, S32 y, MASK mask);
virtual void onMouseLeave(S32 x, S32 y, MASK mask);
virtual void onMouseCaptureLost();

2
indra/llui/lltoolbar.cpp
View File

@ -577,7 +577,7 @@ void LLToolBar::draw()
if (command && btn->mIsRunningSignal)
{
const bool button_command_running = (*btn->mIsRunningSignal)(btn, command->isRunningParameters());
btn->setFlashing(button_command_running);
btn->setToggleState(button_command_running);
}
}
}

7
indra/newview/skins/default/xui/en/widgets/toolbar.xml
View File

@ -12,6 +12,10 @@
bg_opaque_image_overlay="MouseGray"
background_opaque="true"/>
<button_icon_and_text imgoverlay_label_space="7"
label_color_selected="White"
image_pressed="PushButton_Press"
image_pressed_selected="PushButton_Selected_Press"
image_selected="PushButton_Selected_Press"
button_width.min="70"
button_width.max="140"
desired_height="24"
@ -25,6 +29,9 @@
flash_color="EmphasisColor"/>
<button_icon pad_left="10"
pad_right="10"
image_pressed="PushButton_Press"
image_pressed_selected="PushButton_Selected_Press"
image_selected="PushButton_Selected_Press"
desired_height="35"
button_width.min="35"
button_width.max="35"