yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-13 00:24:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

A bunch of alignment fixes to menus.

Browse source 
So far, fixed menus include:
 - Multiplayer
 - Multiplayer -> Start Network Server
 - Multiplayer -> Start Network Server -> Deathmatch Flags
 - Options
 - Video Options

Related to issue #87.
This commit is contained in:
David Reid 2015-10-22 20:36:41 +10:00
parent fc33d5df64
commit c623d5639c
2 changed files with 48 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/client/menu/menu.c
View file

@ -2864,6 +2864,7 @@ StartServer_MenuInit(void)
int length; int length;
int i; int i;
FILE *fp; FILE *fp;
float scale = SCR_GetMenuScale();
/* initialize list of maps once, reuse it afterwards (=> it isn't freed) */ /* initialize list of maps once, reuse it afterwards (=> it isn't freed) */
if (mapnames == NULL) if (mapnames == NULL)
@ -3038,7 +3039,7 @@ StartServer_MenuInit(void)
s_startserver_dmoptions_action.generic.type = MTYPE_ACTION; s_startserver_dmoptions_action.generic.type = MTYPE_ACTION;
s_startserver_dmoptions_action.generic.name = " deathmatch flags"; s_startserver_dmoptions_action.generic.name = " deathmatch flags";
s_startserver_dmoptions_action.generic.flags = QMF_LEFT_JUSTIFY; s_startserver_dmoptions_action.generic.flags = QMF_LEFT_JUSTIFY;
s_startserver_dmoptions_action.generic.x = 24; s_startserver_dmoptions_action.generic.x = 24 * scale;
s_startserver_dmoptions_action.generic.y = 108; s_startserver_dmoptions_action.generic.y = 108;
s_startserver_dmoptions_action.generic.statusbar = NULL; s_startserver_dmoptions_action.generic.statusbar = NULL;
s_startserver_dmoptions_action.generic.callback = DMOptionsFunc; s_startserver_dmoptions_action.generic.callback = DMOptionsFunc;
@ -3046,7 +3047,7 @@ StartServer_MenuInit(void)
s_startserver_start_action.generic.type = MTYPE_ACTION; s_startserver_start_action.generic.type = MTYPE_ACTION;
s_startserver_start_action.generic.name = " begin"; s_startserver_start_action.generic.name = " begin";
s_startserver_start_action.generic.flags = QMF_LEFT_JUSTIFY; s_startserver_start_action.generic.flags = QMF_LEFT_JUSTIFY;
s_startserver_start_action.generic.x = 24; s_startserver_start_action.generic.x = 24 * scale;
s_startserver_start_action.generic.y = 128; s_startserver_start_action.generic.y = 128;
s_startserver_start_action.generic.callback = StartServerActionFunc; s_startserver_start_action.generic.callback = StartServerActionFunc;

87
src/client/menu/qmenu.c
View file

@ -59,19 +59,21 @@ Action_DoEnter(menuaction_s *a)
void void
Action_Draw(menuaction_s *a) Action_Draw(menuaction_s *a)
{ {
float scale = SCR_GetMenuScale();
if (a->generic.flags & QMF_LEFT_JUSTIFY) if (a->generic.flags & QMF_LEFT_JUSTIFY)
{ {
if (a->generic.flags & QMF_GRAYED) if (a->generic.flags & QMF_GRAYED)
{ {
Menu_DrawStringDark(a->generic.x + a->generic.parent->x + Menu_DrawStringDark(a->generic.x + a->generic.parent->x + (LCOLUMN_OFFSET * scale),
LCOLUMN_OFFSET, a->generic.y + a->generic.parent->y, a->generic.y + a->generic.parent->y,
a->generic.name); a->generic.name);
} }
else else
{ {
Menu_DrawString(a->generic.x + a->generic.parent->x + Menu_DrawString(a->generic.x + a->generic.parent->x + (LCOLUMN_OFFSET * scale),
LCOLUMN_OFFSET, a->generic.y + a->generic.parent->y, a->generic.y + a->generic.parent->y,
a->generic.name); a->generic.name);
} }
} }
@ -79,15 +81,15 @@ Action_Draw(menuaction_s *a)
{ {
if (a->generic.flags & QMF_GRAYED) if (a->generic.flags & QMF_GRAYED)
{ {
Menu_DrawStringR2LDark(a->generic.x + a->generic.parent->x + Menu_DrawStringR2LDark(a->generic.x + a->generic.parent->x + (LCOLUMN_OFFSET * scale),
LCOLUMN_OFFSET, a->generic.y + a->generic.parent->y, a->generic.y + a->generic.parent->y,
a->generic.name); a->generic.name);
} }
else else
{ {
Menu_DrawStringR2L(a->generic.x + a->generic.parent->x + Menu_DrawStringR2L(a->generic.x + a->generic.parent->x + (LCOLUMN_OFFSET * scale),
LCOLUMN_OFFSET, a->generic.y + a->generic.parent->y, a->generic.y + a->generic.parent->y,
a->generic.name); a->generic.name);
} }
} }
@ -120,7 +122,7 @@ Field_Draw(menufield_s *f)
if (f->generic.name) if (f->generic.name)
{ {
Menu_DrawStringR2LDark(f->generic.x + f->generic.parent->x + Menu_DrawStringR2LDark(f->generic.x + f->generic.parent->x +
LCOLUMN_OFFSET, f->generic.y + f->generic.parent->y, LCOLUMN_OFFSET * scale, f->generic.y + f->generic.parent->y,
f->generic.name); f->generic.name);
} }
@ -131,27 +133,25 @@ Field_Draw(menufield_s *f)
} }
Q_strlcpy(tempbuffer, f->buffer + f->visible_offset, n); Q_strlcpy(tempbuffer, f->buffer + f->visible_offset, n);
Draw_CharScaled(f->generic.x + (f->generic.parent->x + 16), Draw_CharScaled(f->generic.x + f->generic.parent->x + 16 * scale,
(f->generic.y + f->generic.parent->y - 4) * scale, 18, scale); (f->generic.y + f->generic.parent->y - 4) * scale, 18, scale);
Draw_CharScaled(f->generic.x + f->generic.parent->x + 16, Draw_CharScaled(f->generic.x + f->generic.parent->x + 16 * scale,
(f->generic.y + f->generic.parent->y + 4) * scale, 24, scale); (f->generic.y + f->generic.parent->y + 4) * scale, 24, scale);
Draw_CharScaled(f->generic.x + f->generic.parent->x + 24 + Draw_CharScaled((f->generic.x + f->generic.parent->x + 24 * scale) + (f->visible_length * 8 * scale),
f->visible_length * 8, (f->generic.y + (f->generic.y + f->generic.parent->y - 4) * scale, 20, scale);
f->generic.parent->y - 4) * scale, 20, scale); Draw_CharScaled((f->generic.x + f->generic.parent->x + 24 * scale) + (f->visible_length * 8 * scale),
Draw_CharScaled(f->generic.x + f->generic.parent->x + 24 + (f->generic.y + f->generic.parent->y + 4) * scale, 26, scale);
f->visible_length * 8, (f->generic.y +
f->generic.parent->y + 4) * scale, 26, scale);
for (i = 0; i < f->visible_length; i++) for (i = 0; i < f->visible_length; i++)
{ {
Draw_CharScaled(f->generic.x + f->generic.parent->x + 24 + i * 8, Draw_CharScaled((f->generic.x + f->generic.parent->x + 24 * scale) + (i * 8 * scale),
(f->generic.y + f->generic.parent->y - 4) * scale, 19, scale); (f->generic.y + f->generic.parent->y - 4) * scale, 19, scale);
Draw_CharScaled(f->generic.x + f->generic.parent->x + 24 + i * 8, Draw_CharScaled((f->generic.x + f->generic.parent->x + 24 * scale) + (i * 8 * scale),
(f->generic.y + f->generic.parent->y + 4) * scale, 25, scale); (f->generic.y + f->generic.parent->y + 4) * scale, 25, scale);
} }
Menu_DrawString(f->generic.x + f->generic.parent->x + 24, Menu_DrawString(f->generic.x + f->generic.parent->x + 24 * scale,
f->generic.y + f->generic.parent->y, tempbuffer); f->generic.y + f->generic.parent->y, tempbuffer);
if (Menu_ItemAtCursor(f->generic.parent) == f) if (Menu_ItemAtCursor(f->generic.parent) == f)
@ -170,15 +170,15 @@ Field_Draw(menufield_s *f)
if (((int)(Sys_Milliseconds() / 250)) & 1) if (((int)(Sys_Milliseconds() / 250)) & 1)
{ {
Draw_CharScaled(f->generic.x + f->generic.parent->x + Draw_CharScaled(
(offset * scale + 2) * 8 + 8, (f->generic.y + f->generic.x + f->generic.parent->x + 24 * scale + (offset * 8 * scale),
f->generic.parent->y) * scale, 11, scale); (f->generic.y + f->generic.parent->y) * scale, 11, scale);
} }
else else
{ {
Draw_CharScaled(f->generic.x + f->generic.parent->x + Draw_CharScaled(
(offset * scale + 2) * 8 + 8 *scale, (f->generic.y + f->generic.x + f->generic.parent->x + 24 * scale + (offset * 8 * scale),
f->generic.parent->y) * scale, ' ', scale); (f->generic.y + f->generic.parent->y) * scale, ' ', scale);
} }
} }
} }
@ -392,7 +392,7 @@ Menu_Center(menuframework_s *menu)
height = ((menucommon_s *)menu->items[menu->nitems - 1])->y; height = ((menucommon_s *)menu->items[menu->nitems - 1])->y;
height += 10; height += 10;
menu->y = (VID_HEIGHT - height) / (2 * scale); menu->y = (VID_HEIGHT / scale - height) / 2;
} }
void void
@ -442,13 +442,14 @@ Menu_Draw(menuframework_s *menu)
{ {
if (item->flags & QMF_LEFT_JUSTIFY) if (item->flags & QMF_LEFT_JUSTIFY)
{ {
Draw_CharScaled(menu->x + (item->x - 24 + item->cursor_offset) * scale, Draw_CharScaled(menu->x + (item->x / scale - 24 + item->cursor_offset) * scale,
(menu->y + item->y) * scale, 12 + ((int)(Sys_Milliseconds() / (menu->y + item->y) * scale,
250) & 1), scale); 12 + ((int)(Sys_Milliseconds() / 250) & 1), scale);
} }
else else
{ {
Draw_CharScaled(menu->x + (item->cursor_offset) * scale, (menu->y + item->y) * scale, Draw_CharScaled(menu->x + (item->cursor_offset) * scale,
(menu->y + item->y) * scale,
12 + ((int)(Sys_Milliseconds() / 250) & 1), scale); 12 + ((int)(Sys_Milliseconds() / 250) & 1), scale);
} }
} }
@ -638,9 +639,10 @@ MenuList_Draw(menulist_s *l)
{ {
const char **n; const char **n;
int y = 0; int y = 0;
float scale = SCR_GetMenuScale();
Menu_DrawStringR2LDark(l->generic.x + l->generic.parent->x Menu_DrawStringR2LDark(l->generic.x + l->generic.parent->x
+ LCOLUMN_OFFSET, l->generic.y + l->generic.parent->y, + LCOLUMN_OFFSET * scale, l->generic.y + l->generic.parent->y,
l->generic.name); l->generic.name);
n = l->itemnames; n = l->itemnames;
@ -652,7 +654,7 @@ MenuList_Draw(menulist_s *l)
while (*n) while (*n)
{ {
Menu_DrawStringR2LDark(l->generic.x + l->generic.parent->x + Menu_DrawStringR2LDark(l->generic.x + l->generic.parent->x +
LCOLUMN_OFFSET, l->generic.y + l->generic.parent->y + LCOLUMN_OFFSET * scale, l->generic.y + l->generic.parent->y +
y + 10, *n); y + 10, *n);
n++; n++;
@ -700,7 +702,7 @@ Slider_Draw(menuslider_s *s)
float scale = SCR_GetMenuScale(); float scale = SCR_GetMenuScale();
Menu_DrawStringR2LDark(s->generic.x + s->generic.parent->x + Menu_DrawStringR2LDark(s->generic.x + s->generic.parent->x +
LCOLUMN_OFFSET, s->generic.y + s->generic.parent->y, LCOLUMN_OFFSET * scale, s->generic.y + s->generic.parent->y,
s->generic.name); s->generic.name);
s->range = (s->curvalue - s->minvalue) / s->range = (s->curvalue - s->minvalue) /
@ -716,19 +718,19 @@ Slider_Draw(menuslider_s *s)
s->range = 1; s->range = 1;
} }
Draw_CharScaled(s->generic.x + (s->generic.parent->x + RCOLUMN_OFFSET), Draw_CharScaled(s->generic.x + (s->generic.parent->x + RCOLUMN_OFFSET * scale),
(s->generic.y + s->generic.parent->y) * scale, 128, scale); (s->generic.y + s->generic.parent->y) * scale, 128, scale);
for (i = 0; i < SLIDER_RANGE * scale; i++) for (i = 0; i < SLIDER_RANGE * scale; i++)
{ {
Draw_CharScaled((RCOLUMN_OFFSET + s->generic.x + i * 8 + s->generic.parent->x + 8), Draw_CharScaled((RCOLUMN_OFFSET * scale + s->generic.x + i * 8 + s->generic.parent->x + 8),
(s->generic.y + s->generic.parent->y) * scale, 129, scale); (s->generic.y + s->generic.parent->y) * scale, 129, scale);
} }
Draw_CharScaled((RCOLUMN_OFFSET + s->generic.x + i * 8 + Draw_CharScaled((RCOLUMN_OFFSET * scale + s->generic.x + i * 8 +
s->generic.parent->x + 8), (s->generic.y + s->generic.parent->x + 8), (s->generic.y +
s->generic.parent->y) * scale, 130, scale); s->generic.parent->y) * scale, 130, scale);
Draw_CharScaled(((int)(8 + RCOLUMN_OFFSET + s->generic.parent->x + Draw_CharScaled(((int)(8 + RCOLUMN_OFFSET * scale + s->generic.parent->x +
s->generic.x + (SLIDER_RANGE * scale - 1) * 8 * s->range)), s->generic.x + (SLIDER_RANGE * scale - 1) * 8 * s->range)),
(s->generic.y + s->generic.parent->y) * scale, 131, scale); (s->generic.y + s->generic.parent->y) * scale, 131, scale);
} }
@ -757,17 +759,18 @@ void
SpinControl_Draw(menulist_s *s) SpinControl_Draw(menulist_s *s)
{ {
char buffer[100]; char buffer[100];
float scale = SCR_GetMenuScale();
if (s->generic.name) if (s->generic.name)
{ {
Menu_DrawStringR2LDark(s->generic.x + s->generic.parent->x + Menu_DrawStringR2LDark(s->generic.x + s->generic.parent->x +
LCOLUMN_OFFSET, s->generic.y + s->generic.parent->y, LCOLUMN_OFFSET * scale, s->generic.y + s->generic.parent->y,
s->generic.name); s->generic.name);
} }
if (!strchr(s->itemnames[s->curvalue], '\n')) if (!strchr(s->itemnames[s->curvalue], '\n'))
{ {
Menu_DrawString(RCOLUMN_OFFSET + s->generic.x + Menu_DrawString(RCOLUMN_OFFSET * scale + s->generic.x +
s->generic.parent->x, s->generic.y + s->generic.parent->x, s->generic.y +
s->generic.parent->y, s->generic.parent->y,
s->itemnames[s->curvalue]); s->itemnames[s->curvalue]);
@ -776,11 +779,11 @@ SpinControl_Draw(menulist_s *s)
{ {
strcpy(buffer, s->itemnames[s->curvalue]); strcpy(buffer, s->itemnames[s->curvalue]);
*strchr(buffer, '\n') = 0; *strchr(buffer, '\n') = 0;
Menu_DrawString(RCOLUMN_OFFSET + s->generic.x + Menu_DrawString(RCOLUMN_OFFSET * scale + s->generic.x +
s->generic.parent->x, s->generic.y + s->generic.parent->x, s->generic.y +
s->generic.parent->y, buffer); s->generic.parent->y, buffer);
strcpy(buffer, strchr(s->itemnames[s->curvalue], '\n') + 1); strcpy(buffer, strchr(s->itemnames[s->curvalue], '\n') + 1);
Menu_DrawString(RCOLUMN_OFFSET + s->generic.x + Menu_DrawString(RCOLUMN_OFFSET * scale + s->generic.x +
s->generic.parent->x, s->generic.y + s->generic.parent->x, s->generic.y +
s->generic.parent->y + 10, buffer); s->generic.parent->y + 10, buffer);
} }