Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unbreak ui scaling.

Browse Source
This commit is contained in:
Shyotl
2013-05-27 19:18:47 -05:00
parent 00269e8358
commit d5e1a0dd4b
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llviewerwindow.cpp
View File

@@ -1586,7 +1586,15 @@ LLViewerWindow::LLViewerWindow(
F32 ui_scale_factor = gSavedSettings.getF32("UIScaleFactor"); F32 ui_scale_factor = gSavedSettings.getF32("UIScaleFactor");
mDisplayScale.setVec(llmax(1.f / mWindow->getPixelAspectRatio(), 1.f), llmax(mWindow->getPixelAspectRatio(), 1.f)); mDisplayScale.setVec(llmax(1.f / mWindow->getPixelAspectRatio(), 1.f), llmax(mWindow->getPixelAspectRatio(), 1.f));
mDisplayScale *= ui_scale_factor; if(mWindow->getFullscreen())
{
F32 height_normalization = gSavedSettings.getBOOL("UIAutoScale") ? ((F32)mWindowRectRaw.getHeight() / mDisplayScale.mV[VY]) / 768.f : 1.f;
mDisplayScale *= (ui_scale_factor * height_normalization);
}
else
{
mDisplayScale *= ui_scale_factor;
}
LLUI::setScaleFactor(mDisplayScale); LLUI::setScaleFactor(mDisplayScale);
{ {