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

OPEN-170: "Set Window Size" always increases window size by specified size

master
Geenz 2013-07-11 19:41:57 -04:00
parent b2bec3f99c
commit dc7d287717
1 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
indra/llwindow/llwindowmacosx.cpp
View File

@ -863,26 +863,11 @@ BOOL LLWindowMacOSX::setSizeImpl(const LLCoordScreen size)
BOOL LLWindowMacOSX::setSizeImpl(const LLCoordWindow size)
{
float client_rect[4];
if (mWindow)
{
S32 err = noErr;
getContentViewBounds(mWindow, client_rect);
if (err == noErr)
{
client_rect[2] += size.mX;
client_rect[3] += size.mY;
setWindowSize(mWindow, client_rect[2], client_rect[3]);
}
if (err == noErr)
{
return TRUE;
}
else
{
llinfos << "Error setting size" << err << llendl;
return FALSE;
}
LLCoordScreen screen_size;
convertCoords(size, &screen_size);
return setSizeImpl(screen_size);
}
return FALSE;
}