yquake2
/
yquake2remaster
mirror of https://github.com/yquake2/yquake2remaster.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

A couple more fixes to menu scaling. 

Relates to issue #87. This should be the last commit for the menu scaling.
This commit is contained in:
David Reid 2015-10-22 22:06:48 +10:00
parent dc53635f46
commit 33ad02b0d0
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/client/menu/menu.c
View File

@ -3557,13 +3557,14 @@ DownloadOptions_MenuInit(void)
"no", "yes", 0 "no", "yes", 0
}; };
int y = 0; int y = 0;
float scale = SCR_GetMenuScale();
s_downloadoptions_menu.x = (int)(viddef.width * 0.50f); s_downloadoptions_menu.x = (int)(viddef.width * 0.50f);
s_downloadoptions_menu.nitems = 0; s_downloadoptions_menu.nitems = 0;
s_download_title.generic.type = MTYPE_SEPARATOR; s_download_title.generic.type = MTYPE_SEPARATOR;
s_download_title.generic.name = "Download Options"; s_download_title.generic.name = "Download Options";
s_download_title.generic.x = 48; s_download_title.generic.x = 48 * scale;
s_download_title.generic.y = y; s_download_title.generic.y = y;
s_allow_download_box.generic.type = MTYPE_SPINCONTROL; s_allow_download_box.generic.type = MTYPE_SPINCONTROL;

5
src/client/menu/qmenu.c
View File

@ -485,11 +485,10 @@ Menu_DrawStatusBar(const char *string)
if (string) if (string)
{ {
int l = (int)strlen(string); int l = (int)strlen(string);
int maxcol = VID_WIDTH / 8; float col = (VID_WIDTH / 2) - (l*8 / 2) * scale;
int col = maxcol / 2 - l / 2;
Draw_Fill(0, VID_HEIGHT - 8 * scale, VID_WIDTH, 8 * scale, 4); Draw_Fill(0, VID_HEIGHT - 8 * scale, VID_WIDTH, 8 * scale, 4);
Menu_DrawString(col * 8, VID_HEIGHT / scale - 8, string); Menu_DrawString(col, VID_HEIGHT / scale - 8, string);
} }
else else
{ {