From dc7d287717ed42d1d8aa8b57cfd740ca75fe9e7b Mon Sep 17 00:00:00 2001 From: Geenz Date: Thu, 11 Jul 2013 19:41:57 -0400 Subject: OPEN-170: "Set Window Size" always increases window size by specified size --- indra/llwindow/llwindowmacosx.cpp | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp index e5556c23d4..d657c629b9 100755 --- a/indra/llwindow/llwindowmacosx.cpp +++ b/indra/llwindow/llwindowmacosx.cpp @@ -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; } -- cgit v1.2.3