zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-30 15:52:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

- changed calculation of the scaling value for the option menu.

Browse source 
This was already far too generous and caused space problems, but with localization these became a lot worse, so now it will try to allocate at least 640 virtual pixels for the menu width and only go below that for small resolution ranges where the smaller value would result in too small text.
This commit is contained in:
Christoph Oelckers 2019-02-26 00:07:09 +01:00
parent d2142be282
commit 4a427694ac
1 changed files with 9 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/v_video.cpp
View file

@ -547,36 +547,16 @@ void V_UpdateModeSize (int width, int height)
CleanHeight = height / CleanYfac; CleanHeight = height / CleanYfac;
assert(CleanWidth >= 320 && CleanHeight >= 200); assert(CleanWidth >= 320 && CleanHeight >= 200);
if (width < 800 || width >= 960) int w = screen->GetWidth();
{ int factor;
if (cx1 < cx2) if (w < 640) factor = 1;
{ else if (w >= 1024 && w < 1280) factor = 2;
// Special case in which we don't need to scale down. else if (w >= 1600 && w < 1920) factor = 3;
CleanXfac_1 = else factor = w / 640;
CleanYfac_1 = cx1;
} CleanXfac_1 = CleanYfac_1 = factor;
else
{
CleanXfac_1 = MAX(CleanXfac - 1, 1);
CleanYfac_1 = MAX(CleanYfac - 1, 1);
// On larger screens this is not enough so make sure it's at most 3/4 of the screen's width
while (CleanXfac_1 * 320 > screen->GetWidth()*3/4 && CleanXfac_1 > 2)
{
CleanXfac_1--;
CleanYfac_1--;
}
}
CleanWidth_1 = width / CleanXfac_1; CleanWidth_1 = width / CleanXfac_1;
CleanHeight_1 = height / CleanYfac_1; CleanHeight_1 = height / CleanYfac_1;
}
else // if the width is between 800 and 960 the ratio between the screensize and CleanXFac-1 becomes too large.
{
CleanXfac_1 = CleanXfac;
CleanYfac_1 = CleanYfac;
CleanWidth_1 = CleanWidth;
CleanHeight_1 = CleanHeight;
}
DisplayWidth = width; DisplayWidth = width;
DisplayHeight = height; DisplayHeight = height;