From 943362559cb4c5cd77ea8d6bcea20d9d27921159 Mon Sep 17 00:00:00 2001 From: Dav999 Date: Fri, 21 Apr 2023 23:30:49 +0200 Subject: [PATCH] Adapt font size as needed for "Credits" title in rolling credits In Italian, "Credits" is "Riconoscimenti", which runs offscreen with the 3x font size that this title uses in the rolling credits at the end of the game. I'm not sure if the translators saw that specific instance, or thought the limit complaint was about the main menu button all along (which is more prominent and *does* stick out far enough that the complaint could plausibly have been about that, from a translator's perspective!) Either way, it's solved now: this string's width is now checked, and if it will run offscreen at 3x size, it will now be displayed at 2x size instead. The limit has been increased from 13 to 20 in the language files accordingly. --- desktop_version/lang/ca/strings.xml | 2 +- desktop_version/lang/de/strings.xml | 2 +- desktop_version/lang/en/strings.xml | 2 +- desktop_version/lang/eo/strings.xml | 2 +- desktop_version/lang/es/strings.xml | 2 +- desktop_version/lang/fr/strings.xml | 2 +- desktop_version/lang/it/strings.xml | 2 +- desktop_version/lang/nl/strings.xml | 2 +- desktop_version/lang/pt_BR/strings.xml | 2 +- desktop_version/lang/pt_PT/strings.xml | 2 +- desktop_version/lang/ru/strings.xml | 2 +- desktop_version/lang/tr/strings.xml | 2 +- desktop_version/src/Render.cpp | 11 ++++++++++- 13 files changed, 22 insertions(+), 13 deletions(-) diff --git a/desktop_version/lang/ca/strings.xml b/desktop_version/lang/ca/strings.xml index 09dafaa4..7c1a444a 100644 --- a/desktop_version/lang/ca/strings.xml +++ b/desktop_version/lang/ca/strings.xml @@ -107,7 +107,7 @@ - + diff --git a/desktop_version/lang/de/strings.xml b/desktop_version/lang/de/strings.xml index a6f3705a..f00c03d8 100644 --- a/desktop_version/lang/de/strings.xml +++ b/desktop_version/lang/de/strings.xml @@ -107,7 +107,7 @@ - + diff --git a/desktop_version/lang/en/strings.xml b/desktop_version/lang/en/strings.xml index 6b9a3b3f..39c51b3d 100644 --- a/desktop_version/lang/en/strings.xml +++ b/desktop_version/lang/en/strings.xml @@ -107,7 +107,7 @@ - + diff --git a/desktop_version/lang/eo/strings.xml b/desktop_version/lang/eo/strings.xml index df7b7120..ff604638 100644 --- a/desktop_version/lang/eo/strings.xml +++ b/desktop_version/lang/eo/strings.xml @@ -107,7 +107,7 @@ - + diff --git a/desktop_version/lang/es/strings.xml b/desktop_version/lang/es/strings.xml index 37189b0f..982a0aa3 100644 --- a/desktop_version/lang/es/strings.xml +++ b/desktop_version/lang/es/strings.xml @@ -107,7 +107,7 @@ - + diff --git a/desktop_version/lang/fr/strings.xml b/desktop_version/lang/fr/strings.xml index edc36a43..5de883e1 100644 --- a/desktop_version/lang/fr/strings.xml +++ b/desktop_version/lang/fr/strings.xml @@ -107,7 +107,7 @@ - + diff --git a/desktop_version/lang/it/strings.xml b/desktop_version/lang/it/strings.xml index b7a8a73a..4a8f6ced 100644 --- a/desktop_version/lang/it/strings.xml +++ b/desktop_version/lang/it/strings.xml @@ -107,7 +107,7 @@ - + diff --git a/desktop_version/lang/nl/strings.xml b/desktop_version/lang/nl/strings.xml index 29f442d6..738b93fb 100644 --- a/desktop_version/lang/nl/strings.xml +++ b/desktop_version/lang/nl/strings.xml @@ -107,7 +107,7 @@ - + diff --git a/desktop_version/lang/pt_BR/strings.xml b/desktop_version/lang/pt_BR/strings.xml index f3083741..3304be2d 100644 --- a/desktop_version/lang/pt_BR/strings.xml +++ b/desktop_version/lang/pt_BR/strings.xml @@ -107,7 +107,7 @@ - + diff --git a/desktop_version/lang/pt_PT/strings.xml b/desktop_version/lang/pt_PT/strings.xml index 3dcc330a..4ed16c39 100644 --- a/desktop_version/lang/pt_PT/strings.xml +++ b/desktop_version/lang/pt_PT/strings.xml @@ -107,7 +107,7 @@ - + diff --git a/desktop_version/lang/ru/strings.xml b/desktop_version/lang/ru/strings.xml index 801e78a1..6d21683a 100644 --- a/desktop_version/lang/ru/strings.xml +++ b/desktop_version/lang/ru/strings.xml @@ -107,7 +107,7 @@ - + diff --git a/desktop_version/lang/tr/strings.xml b/desktop_version/lang/tr/strings.xml index f2c87b11..2e0d8f85 100644 --- a/desktop_version/lang/tr/strings.xml +++ b/desktop_version/lang/tr/strings.xml @@ -107,7 +107,7 @@ - + diff --git a/desktop_version/src/Render.cpp b/desktop_version/src/Render.cpp index f430e82d..e7cf86d5 100644 --- a/desktop_version/src/Render.cpp +++ b/desktop_version/src/Render.cpp @@ -1766,7 +1766,16 @@ void gamecompleterender(void) font::print(0, 100, 480 + position, loc::gettext("Doctor Victoria"), tr, tg, tb); } - if (graphics.onscreen(520 + position)) font::print(PR_3X | PR_CEN, -1, 520 + position, loc::gettext("Credits"), tr, tg, tb); + if (graphics.onscreen(520 + position)) + { + uint32_t flag = PR_3X; + const char* text = loc::gettext("Credits"); + if (font::len(flag, text) > SCREEN_WIDTH_PIXELS) + { + flag = PR_2X; + } + font::print(flag | PR_CEN, -1, 520 + position, text, tr, tg, tb); + } if (graphics.onscreen(560 + position)) {