From 2a93df9888c8a755b51a5a9e39e089550ca9d1f2 Mon Sep 17 00:00:00 2001 From: PavelK ProductEngine Date: Wed, 12 Jun 2013 19:22:27 +0300 Subject: 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 --- indra/newview/llfloaterimsessiontab.cpp | 10 ++++++++++ indra/newview/llfloaterimsessiontab.h | 2 ++ indra/newview/llimview.cpp | 3 +-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp index 53b439b32e..559e9ab23f 100755 --- a/indra/newview/llfloaterimsessiontab.cpp +++ b/indra/newview/llfloaterimsessiontab.cpp @@ -270,6 +270,7 @@ BOOL LLFloaterIMSessionTab::postBuild() mInputPanels = getChild("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; diff --git a/indra/newview/llfloaterimsessiontab.h b/indra/newview/llfloaterimsessiontab.h index e5f17a25f4..e7b05a584b 100755 --- a/indra/newview/llfloaterimsessiontab.h +++ b/indra/newview/llfloaterimsessiontab.h @@ -203,6 +203,8 @@ private: */ void reshapeChatLayoutPanel(); + void onInputEditorClicked(); + bool checkIfTornOff(); bool mIsHostAttached; bool mHasVisibleBeenInitialized; diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index ecd22a5c1b..b43e9296f9 100755 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -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); } -- cgit v1.2.3