thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

scratchass big buttons

Browse source
This commit is contained in:
Antonio Martinez 2024-09-19 21:51:32 -07:00 • committed by AJ Martinez
parent 43960d7a23
commit 9a669ff864
3 changed files with 26 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/k_dialogue.cpp
View file

@ -486,18 +486,22 @@ void Dialogue::Draw(void)
.patch(patchCache["TUTDIAG2"]); .patch(patchCache["TUTDIAG2"]);
} }
auto bt_translate_press = [this]() -> std::optional<bool> std::string ctrl = "<large>";
{
if (Held()) if (Held())
return true; ctrl += "<z_pressed>";
if (TextDone()) else if (TextDone())
return {}; ctrl += "<z_animated>";
return false; else
}; ctrl += "<z>";
// FIXME: Old animation behavior (bt_translate_press above)
std::string parsedctrl = srb2::Draw::TextElement().parse(ctrl).string();
drawer drawer
.xy(17-14 - BASEVIDWIDTH, -39-16) .xy(17-14 - BASEVIDWIDTH, -39-16)
.button(srb2::Draw::Button::z, bt_translate_press()); .font(Draw::Font::kMenu)
.text(parsedctrl);
} }
} }

2
src/k_hud.cpp
View file

@ -6496,7 +6496,7 @@ void K_drawKartHUD(void)
#if 1 #if 1
using srb2::Draw; using srb2::Draw;
if (1) if (0)
{ {
// Draw::TextElement text = Draw::TextElement().parse("A <a> B <b> C <c> X <x> Y <y> Z <z>\nST <start> L <l> R <r> U <up> D <down> L <left> R <right>"); // Draw::TextElement text = Draw::TextElement().parse("A <a> B <b> C <c> X <x> Y <y> Z <z>\nST <start> L <l> R <r> U <up> D <down> L <left> R <right>");
Draw::TextElement text = Draw::TextElement().parse("Unpressed <large><a> Pressed <x_pressed> Animated <large><start_animated>"); Draw::TextElement text = Draw::TextElement().parse("Unpressed <large><a> Pressed <x_pressed> Animated <large><start_animated>");

14
src/v_video.cpp
View file

@ -2862,11 +2862,16 @@ void V_DrawStringScaled(
}; };
cw = V_GetButtonCodeWidth(c) * dupx; cw = V_GetButtonCodeWidth(c) * dupx;
// FIXME do real widths
if (largebutton)
cw += 3*dupx;
cxoff = (*fontspec.dim_fn)(scale, fontspec.chw, hchw, dupx, &cw); cxoff = (*fontspec.dim_fn)(scale, fontspec.chw, hchw, dupx, &cw);
Draw bt = Draw( Draw bt = Draw(
FixedToFloat(cx + cxoff) - (bt_inst->x * dupx), FixedToFloat(cx + cxoff) - (bt_inst->x * dupx),
FixedToFloat(cy + cyoff) - ((bt_inst->y + fontspec.button_yofs) * dupy)) FixedToFloat(cy + cyoff) - ((bt_inst->y + fontspec.button_yofs) * dupy) - (largebutton ? 2*dupy : 0))
.flags(flags); .flags(flags);
if (largebutton) if (largebutton)
@ -2924,11 +2929,16 @@ void V_DrawStringScaled(
}; };
cw = V_GetGenericButtonCodeWidth(c) * dupx; cw = V_GetGenericButtonCodeWidth(c) * dupx;
// FIXME do real widths
if (largebutton)
cw += 3*dupx;
cxoff = (*fontspec.dim_fn)(scale, fontspec.chw, hchw, dupx, &cw); cxoff = (*fontspec.dim_fn)(scale, fontspec.chw, hchw, dupx, &cw);
Draw bt = Draw( Draw bt = Draw(
FixedToFloat(cx + cxoff) - (bt_inst->x * dupx), FixedToFloat(cx + cxoff) - (bt_inst->x * dupx),
FixedToFloat(cy + cyoff) - ((bt_inst->y + fontspec.button_yofs) * dupy)) FixedToFloat(cy + cyoff) - ((bt_inst->y + fontspec.button_yofs) * dupy) - (largebutton ? 2*dupy : 0))
.flags(flags); .flags(flags);
if (largebutton) if (largebutton)