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

CHUI-377 (Icons in message panel out of position when nearby chat conversation selected) 

FIXED
meow-7.2.2
MaximB ProductEngine 2012-10-10 20:04:56 +03:00
parent 93e36340ec
commit 8b4423d428
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
indra/newview/llimconversation.cpp
View File

@ -393,7 +393,7 @@ void LLIMConversation::updateHeaderAndToolbar()
// prevent start conversation before its container
LLIMFloaterContainer::getInstance();
bool is_torn_off = !getHost();
bool is_torn_off = checkIfTornOff();
if (!is_torn_off)
{
hideAllStandardButtons();
@ -505,16 +505,7 @@ void LLIMConversation::onSlide(LLIMConversation* self)
/*virtual*/
void LLIMConversation::onOpen(const LLSD& key)
{
LLIMFloaterContainer* host_floater = dynamic_cast<LLIMFloaterContainer*>(getHost());
bool is_hosted = !!host_floater;
if (is_hosted)
{
// Show the messages pane when opening a floater hosted in the Conversations
host_floater->collapseMessagesPane(false);
}
setTornOff(!is_hosted);
updateHeaderAndToolbar();
checkIfTornOff();
}
// virtual
@ -546,3 +537,23 @@ bool LLIMConversation::isChatMultiTab()
// Restart is required in order to change chat window type.
return true;
}
bool LLIMConversation::checkIfTornOff()
{
bool isTorn = !getHost();
if (!isTorn)
{
LLIMFloaterContainer* host_floater = dynamic_cast<LLIMFloaterContainer*>(getHost());
// Show the messages pane when opening a floater hosted in the Conversations
host_floater->collapseMessagesPane(false);
}
if (isTorn != isTornOff())
{
setTornOff(isTorn);
updateHeaderAndToolbar();
}
return isTorn;
}

2
indra/newview/llimconversation.h
View File

@ -138,6 +138,8 @@ private:
*/
void reshapeChatHistory();
bool checkIfTornOff();
LLTimer* mRefreshTimer; ///< Defines the rate at which refresh() is called.
bool mHadFocus;