1
0
Fork 0

Codefix: Don't assume 9 is the widest digit (#12870)

Use `SetDParamMaxDigit()` instead of `SetDParam()` with a large number.
pull/12871/head
Peter Nelson 2024-07-19 19:00:21 +01:00 committed by GitHub
parent 97479eb953
commit 333e8e590e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions

View File

@ -545,18 +545,18 @@ struct FramerateWindow : Window {
switch (widget) { switch (widget) {
case WID_FRW_RATE_GAMELOOP: case WID_FRW_RATE_GAMELOOP:
SetDParam(0, STR_FRAMERATE_FPS_GOOD); SetDParam(0, STR_FRAMERATE_FPS_GOOD);
SetDParam(1, 999999); SetDParamMaxDigits(1, 6);
SetDParam(2, 2); SetDParam(2, 2);
size = GetStringBoundingBox(STR_FRAMERATE_RATE_GAMELOOP); size = GetStringBoundingBox(STR_FRAMERATE_RATE_GAMELOOP);
break; break;
case WID_FRW_RATE_DRAWING: case WID_FRW_RATE_DRAWING:
SetDParam(0, STR_FRAMERATE_FPS_GOOD); SetDParam(0, STR_FRAMERATE_FPS_GOOD);
SetDParam(1, 999999); SetDParamMaxDigits(1, 6);
SetDParam(2, 2); SetDParam(2, 2);
size = GetStringBoundingBox(STR_FRAMERATE_RATE_BLITTER); size = GetStringBoundingBox(STR_FRAMERATE_RATE_BLITTER);
break; break;
case WID_FRW_RATE_FACTOR: case WID_FRW_RATE_FACTOR:
SetDParam(0, 999999); SetDParamMaxDigits(0, 6);
SetDParam(1, 2); SetDParam(1, 2);
size = GetStringBoundingBox(STR_FRAMERATE_SPEED_FACTOR); size = GetStringBoundingBox(STR_FRAMERATE_SPEED_FACTOR);
break; break;
@ -585,7 +585,7 @@ struct FramerateWindow : Window {
case WID_FRW_TIMES_AVERAGE: case WID_FRW_TIMES_AVERAGE:
case WID_FRW_ALLOCSIZE: { case WID_FRW_ALLOCSIZE: {
size = GetStringBoundingBox(STR_FRAMERATE_CURRENT + (widget - WID_FRW_TIMES_CURRENT)); size = GetStringBoundingBox(STR_FRAMERATE_CURRENT + (widget - WID_FRW_TIMES_CURRENT));
SetDParam(0, 999999); SetDParamMaxDigits(0, 6);
SetDParam(1, 2); SetDParam(1, 2);
Dimension item_size = GetStringBoundingBox(STR_FRAMERATE_MS_GOOD); Dimension item_size = GetStringBoundingBox(STR_FRAMERATE_MS_GOOD);
size.width = std::max(size.width, item_size.width); size.width = std::max(size.width, item_size.width);