diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-04-06 00:21:29 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-04-06 00:21:29 +0300 |
| commit | 8f931a4768df909050f9f8609c8e74d977e38026 (patch) | |
| tree | 4285626e13a351af4e02cd2c7a06e547c4484e09 /indra/newview/llviewerwindow.cpp | |
| parent | d329f6a9b83b4fdd69b3879d958d64ce83f222dd (diff) | |
| parent | b6301eba2cc8a3eaa1b9bf7c9d28459f875f9a9b (diff) | |
Merged in lindenlab/viewer-bear
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index e293db0342..a1edbf6add 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1765,7 +1765,10 @@ LLViewerWindow::LLViewerWindow(const Params& p) // Get the real window rect the window was created with (since there are various OS-dependent reasons why // the size of a window or fullscreen context may have been adjusted slightly...) - F32 ui_scale_factor = llclamp(gSavedSettings.getF32("UIScaleFactor"), MIN_UI_SCALE, MAX_UI_SCALE) * mWindow->getSystemUISize(); + F32 ui_scale_factor = llclamp(gSavedSettings.getF32("UIScaleFactor"), MIN_UI_SCALE, MAX_UI_SCALE); +#if LL_DARWIN + ui_scale_factor *= mWindow->getSystemUISize(); +#endif mDisplayScale.setVec(llmax(1.f / mWindow->getPixelAspectRatio(), 1.f), llmax(mWindow->getPixelAspectRatio(), 1.f)); mDisplayScale *= ui_scale_factor; @@ -5338,7 +5341,11 @@ F32 LLViewerWindow::getWorldViewAspectRatio() const void LLViewerWindow::calcDisplayScale() { - F32 ui_scale_factor = llclamp(gSavedSettings.getF32("UIScaleFactor"), MIN_UI_SCALE, MAX_UI_SCALE) * mWindow->getSystemUISize(); + F32 ui_scale_factor = llclamp(gSavedSettings.getF32("UIScaleFactor"), MIN_UI_SCALE, MAX_UI_SCALE); +#if LL_DARWIN + ui_scale_factor *= mWindow->getSystemUISize(); +#endif + LLVector2 display_scale; display_scale.setVec(llmax(1.f / mWindow->getPixelAspectRatio(), 1.f), llmax(mWindow->getPixelAspectRatio(), 1.f)); display_scale *= ui_scale_factor; |