diff options
author | Sergeanur <s.anureev@yandex.ua> | 2021-02-12 18:00:20 +0200 |
---|---|---|
committer | Sergeanur <s.anureev@yandex.ua> | 2021-02-12 18:00:20 +0200 |
commit | e98164ec41c3629c592bb31d8b110d85626c5e3c (patch) | |
tree | f4e345af3889cbec4d2a9239b6570ee21ee1e9f4 /src/core | |
parent | b1698948e6fcd57f7f41206b3b85b1f88cbaa6e2 (diff) |
Sync aspect ratio setting with master
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/Frontend.cpp | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp index 4c847596..861e67d1 100644 --- a/src/core/Frontend.cpp +++ b/src/core/Frontend.cpp @@ -1138,18 +1138,34 @@ CMenuManager::DrawStandardMenus(bool activeScreen) #else switch (m_PrefsUseWideScreen) { case AR_AUTO: - sprintf(asciiTemp, "AUTO"); + rightText = TheText.Get("FEM_AUT"); break; case AR_4_3: sprintf(asciiTemp, "4:3"); + AsciiToUnicode(asciiTemp, unicodeTemp); + rightText = unicodeTemp; + break; + case AR_5_4: + sprintf(asciiTemp, "5:4"); + AsciiToUnicode(asciiTemp, unicodeTemp); + rightText = unicodeTemp; + break; + case AR_16_10: + sprintf(asciiTemp, "16:10"); + AsciiToUnicode(asciiTemp, unicodeTemp); + rightText = unicodeTemp; break; case AR_16_9: sprintf(asciiTemp, "16:9"); + AsciiToUnicode(asciiTemp, unicodeTemp); + rightText = unicodeTemp; + break; + case AR_21_9: + sprintf(asciiTemp, "21:9"); + AsciiToUnicode(asciiTemp, unicodeTemp); + rightText = unicodeTemp; break; } - - AsciiToUnicode(asciiTemp, unicodeTemp); - rightText = unicodeTemp; #endif break; @@ -4951,12 +4967,12 @@ CMenuManager::ProcessUserInput(uint8 goDown, uint8 goUp, uint8 optionSelected, u case MENUACTION_WIDESCREEN: if (changeAmount > 0) { m_PrefsUseWideScreen++; - if (m_PrefsUseWideScreen > 2) + if (m_PrefsUseWideScreen > AR_MAX - 1) m_PrefsUseWideScreen = 0; } else { m_PrefsUseWideScreen--; if (m_PrefsUseWideScreen < 0) - m_PrefsUseWideScreen = 2; + m_PrefsUseWideScreen = AR_MAX - 1; } SaveSettings(); break; |