Some keycap alignment stuff

This commit is contained in:
Antonio Martinez 2024-09-19 06:17:11 -07:00 committed by AJ Martinez
parent 9edeaaf0ba
commit 9c622c283b
2 changed files with 9 additions and 5 deletions

View file

@ -6509,7 +6509,7 @@ void K_drawKartHUD(void)
} }
if (1) if (0)
{ {
Draw::TextElement text = Draw::TextElement().parse("\xEELEFTSPACE\xEE\n\xEESPC\xEE \xEETAB\xEE\nA \xEF\xA0 A\nB \xEF\xA1 B\nX \xEF\xA2 X\nY \xEF\xA3 Y\nLB \xEF\xA4 LB\nRB \xEF\xA5 RB\nLT \xEF\xA6 LT\nRT \xEF\xA7 RT\nST \xEF\xA8 ST\nBK \xEF\xA9 BK\nLS \xEF\xAA LS\nRS \xEF\xAB RS\n"); Draw::TextElement text = Draw::TextElement().parse("\xEELEFTSPACE\xEE\n\xEESPC\xEE \xEETAB\xEE\nA \xEF\xA0 A\nB \xEF\xA1 B\nX \xEF\xA2 X\nY \xEF\xA3 Y\nLB \xEF\xA4 LB\nRB \xEF\xA5 RB\nLT \xEF\xA6 LT\nRT \xEF\xA7 RT\nST \xEF\xA8 ST\nBK \xEF\xA9 BK\nLS \xEF\xAA LS\nRS \xEF\xAB RS\n");

View file

@ -2710,6 +2710,7 @@ void V_DrawStringScaled(
if (boxed == 0) // Save our position and start no-op drawing if (boxed == 0) // Save our position and start no-op drawing
{ {
// TODO animate // TODO animate
cy -= 2*FRACUNIT;
Draw(FixedToFloat(cx), FixedToFloat(cy)-3).patch(gen_button_keyleft[0]); Draw(FixedToFloat(cx), FixedToFloat(cy)-3).patch(gen_button_keyleft[0]);
cx += 3*FRACUNIT; cx += 3*FRACUNIT;
ssave = s; ssave = s;
@ -2729,10 +2730,11 @@ void V_DrawStringScaled(
cx = cxsave; cx = cxsave;
boxed = 2; boxed = 2;
} }
else // Meeting the ending tag the second time, noop else // Meeting the ending tag the second time, space away and resume standard parsing
{ {
boxed = 0; boxed = 0;
cx += (4)*FRACUNIT; cx += (3)*FRACUNIT;
cy += 2*FRACUNIT;
} }
break; break;
@ -2969,7 +2971,7 @@ void V_DrawStringScaled(
if (boxed != 1) if (boxed != 1)
{ {
V_DrawFixedPatch(cx + cxoff + patchxofs, cy + cyoff, scale, V_DrawFixedPatch(cx + cxoff + patchxofs, cy + cyoff, scale,
flags | ((boxed == 2) ? V_20TRANS : 0), font->font[c], colormap); flags | ((boxed == 2) ? V_40TRANS : 0), font->font[c], colormap);
} }
cx += cw; cx += cw;
@ -3063,7 +3065,9 @@ fixed_t V_StringScaledWidth(
break; break;
case '\xEE': case '\xEE':
if (boxed) if (boxed)
cx += 2*scale; cx += 3*FRACUNIT;
else
cx += 3*FRACUNIT;
boxed = !boxed; boxed = !boxed;
break; break;
default: default: