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

Fixed opening size of floaters if more than one floater of a group is opened (use saved size instead of size defined in XML)

Ansariel 2012-09-22 23:40:42 +02:00
parent 1759354203
commit 2c19e73688
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
indra/llui/llfloater.cpp
View File

@ -947,6 +947,19 @@ bool LLFloater::applyRectControl()
LLFloater* last_in_group = LLFloaterReg::getLastFloaterInGroup(mInstanceName);
if (last_in_group && last_in_group != this)
{
// <FS:Ansariel> Open other floaters in group in the stored size (this
// is basically taken from the else-branch below)
if (!mRectControl.empty())
{
// If we have a saved rect, use it
const LLRect& rect = getControlGroup()->getRect(mRectControl);
if (rect.notEmpty() && mResizable)
{
reshape(llmax(mMinWidth, rect.getWidth()), llmax(mMinHeight, rect.getHeight()));
}
}
// </FS:Ansariel>
// other floaters in our group, position ourselves relative to them and don't save the rect
mRectControl.clear();
mPositioning = LLFloaterEnums::POSITIONING_CASCADE_GROUP;