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

CHUI-896 ADD FIX Line flashing and FUI button flashing not working correctly for CHUI notifications 

1) Fixed line flashing upon conversation floater opening (previously was highlight only)
2) Fixed line highlight (and flashing) clearing when clicking Chat input field
meow-7.2.2
PavelK ProductEngine 2013-06-12 19:22:27 +03:00
parent e65de16ea1
commit 2a93df9888
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llfloaterimsessiontab.cpp
View File

@ -270,6 +270,7 @@ BOOL LLFloaterIMSessionTab::postBuild()
mInputPanels = getChild<LLLayoutStack>("input_panels");
mInputEditor->setTextExpandedCallback(boost::bind(&LLFloaterIMSessionTab::reshapeChatLayoutPanel, this));
mInputEditor->setMouseUpCallback(boost::bind(&LLFloaterIMSessionTab::onInputEditorClicked, this));
mInputEditor->setCommitOnFocusLost( FALSE );
mInputEditor->setPassDelete(TRUE);
mInputEditor->setFont(LLViewerChat::getChatFont());
@ -399,6 +400,15 @@ void LLFloaterIMSessionTab::onFocusLost()
LLTransientDockableFloater::onFocusLost();
}
void LLFloaterIMSessionTab::onInputEditorClicked()
{
LLFloaterIMContainer* im_box = LLFloaterIMContainer::findInstance();
if (im_box)
{
im_box->flashConversationItemWidget(mSessionID,false);
}
}
std::string LLFloaterIMSessionTab::appendTime()
{
time_t utc_time;

2
indra/newview/llfloaterimsessiontab.h
View File

@ -203,6 +203,8 @@ private:
*/
void reshapeChatLayoutPanel();
void onInputEditorClicked();
bool checkIfTornOff();
bool mIsHostAttached;
bool mHasVisibleBeenInitialized;

3
indra/newview/llimview.cpp
View File

@ -311,10 +311,9 @@ void notify_of_message(const LLSD& msg, bool is_dnd_msg)
}
else
{
if ((is_dnd_msg && (ON_TOP == conversations_floater_status ||
if (is_dnd_msg && (ON_TOP == conversations_floater_status ||
NOT_ON_TOP == conversations_floater_status ||
CLOSED == conversations_floater_status))
|| CLOSED == conversations_floater_status)
{
im_box->highlightConversationItemWidget(session_id, true);
}