thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-28 04:51:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Menus: scrunch text box height

Browse source
This commit is contained in:
James R 2023-12-31 20:27:23 -08:00
parent 2edc583e61
commit 70cf10bc1e
1 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/k_menudraw.c
View file

@ -98,7 +98,7 @@ fixed_t M_DueFrac(tic_t start, tic_t duration)
} }
#define SKULLXOFF -32 #define SKULLXOFF -32
#define LINEHEIGHT 17 #define LINEHEIGHT 13
#define STRINGHEIGHT 9 #define STRINGHEIGHT 9
#define FONTBHEIGHT 20 #define FONTBHEIGHT 20
#define SMALLLINEHEIGHT 9 #define SMALLLINEHEIGHT 9
@ -4399,13 +4399,19 @@ box_found:
#endif #endif
case IT_STRING: case IT_STRING:
case IT_LINKTEXT: { case IT_LINKTEXT: {
boolean textBox = (currentMenu->menuitems[i].status & IT_TYPE) == IT_CVAR &&
(currentMenu->menuitems[i].status & IT_CVARTYPE) == IT_CV_STRING;
if (textBox)
{
if (opening)
y += LINEHEIGHT;
else
M_DrawTextBox(x, y, MAXSTRINGLENGTH, 1);
}
if (opening) if (opening)
{ {
if ((currentMenu->menuitems[i].status & IT_TYPE) == IT_CVAR &&
(currentMenu->menuitems[i].status & IT_CVARTYPE) == IT_CV_STRING)
{
y += LINEHEIGHT;
}
y += STRINGHEIGHT; y += STRINGHEIGHT;
break; break;
} }
@ -4419,7 +4425,7 @@ box_found:
if (i == itemOn) if (i == itemOn)
V_DrawMenuString(px + 1, y, highlightflags, currentMenu->menuitems[i].text); V_DrawMenuString(px + 1, y, highlightflags, currentMenu->menuitems[i].text);
else else
V_DrawMenuString(px, y, 0, currentMenu->menuitems[i].text); V_DrawMenuString(px, y, textBox ? V_GRAYMAP : 0, currentMenu->menuitems[i].text);
if ((currentMenu->menuitems[i].status & IT_DISPLAY) == IT_LINKTEXT) if ((currentMenu->menuitems[i].status & IT_DISPLAY) == IT_LINKTEXT)
M_DrawLinkArrow(x, y, i); M_DrawLinkArrow(x, y, i);
@ -4444,16 +4450,14 @@ box_found:
break; break;
case IT_CV_STRING: case IT_CV_STRING:
{ {
M_DrawTextBox(x, y + 4, MAXSTRINGLENGTH, 1); INT32 xoffs = 6;
INT32 xoffs = 0;
if (itemOn == i) if (itemOn == i)
{ {
xoffs += 8; xoffs = 8;
V_DrawMenuString(x + (skullAnimCounter/5) + 7, y + 11, highlightflags, "\x1D"); V_DrawMenuString(x + (skullAnimCounter/5) + 7, y + 9, highlightflags, "\x1D");
} }
V_DrawString(x + xoffs + 8, y + 12, 0, cv->string); V_DrawString(x + xoffs + 8, y + 9, 0, cv->string);
y += LINEHEIGHT; y += LINEHEIGHT;
} }