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

CHUI-608 (Conversations floater can be resized too small once a conversation is torn off)

meow-7.2.2
maximbproductengine 2013-01-04 16:48:34 +02:00
parent 3d83fc3da5
commit 4d971c4351
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llfloaterimcontainer.cpp
View File

@ -605,6 +605,12 @@ void LLFloaterIMContainer::setVisible(BOOL visible)
LLMultiFloater::setVisible(visible);
}
void LLFloaterIMContainer::updateResizeLimits()
{
LLMultiFloater::updateResizeLimits();
assignResizeLimits();
}
void LLFloaterIMContainer::collapseMessagesPane(bool collapse)
{
if (mMessagesPane->isCollapsed() == collapse)

1
indra/newview/llfloaterimcontainer.h
View File

@ -60,6 +60,7 @@ public:
/*virtual*/ void onOpen(const LLSD& key);
/*virtual*/ void draw();
/*virtual*/ void setVisible(BOOL visible);
/*virtual*/ void updateResizeLimits();
void onCloseFloater(LLUUID& id);
/*virtual*/ void addFloater(LLFloater* floaterp,

5
indra/newview/llfloaterimsessiontab.cpp
View File

@ -751,11 +751,6 @@ void LLFloaterIMSessionTab::onTearOffClicked()
{
forceReshape();
}
LLFloaterIMContainer* container = LLFloaterIMContainer::getInstance();
if (container)
{
container->assignResizeLimits();
}
refreshConversation();
updateGearBtn();
}