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

CHUI-61 FIX Relative floater positions not written to settings file if previous settings exist from old viewer

master
Richard Linden 2012-03-21 14:01:54 -07:00
parent 2fe364dfaf
commit 71db6d1b91
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/llui/llfloater.cpp
View File

@ -868,6 +868,7 @@ bool LLFloater::applyRectControl()
}
else
{
bool rect_specified = false;
if (!mRectControl.empty())
{
// If we have a saved rect, use it
@ -881,10 +882,11 @@ bool LLFloater::applyRectControl()
{
reshape(llmax(mMinWidth, rect.getWidth()), llmax(mMinHeight, rect.getHeight()));
}
mPositioning = LLFloaterEnums::POSITIONING_RELATIVE;
LLRect screen_rect = calcScreenRect();
mPosition = LLCoordGL(screen_rect.getCenterX(), screen_rect.getCenterY()).convert();
rect_specified = true;
}
mPositioning = LLFloaterEnums::POSITIONING_RELATIVE;
LLRect screen_rect = calcScreenRect();
mPosition = LLCoordGL(screen_rect.getCenterX(), screen_rect.getCenterY()).convert();
}
LLControlVariablePtr x_control = getControlGroup()->getControl(mPosXControl);
@ -903,7 +905,7 @@ bool LLFloater::applyRectControl()
}
// remember updated position
if (mPositioning == LLFloaterEnums::POSITIONING_RELATIVE)
if (rect_specified)
{
storeRectControl();
}