diff --git a/es-app/src/guis/GuiApplicationUpdater.cpp b/es-app/src/guis/GuiApplicationUpdater.cpp index 4b46e34b5..03c8049da 100644 --- a/es-app/src/guis/GuiApplicationUpdater.cpp +++ b/es-app/src/guis/GuiApplicationUpdater.cpp @@ -43,8 +43,10 @@ GuiApplicationUpdater::GuiApplicationUpdater() setDownloadPath(); // Set up grid. - mTitle = std::make_shared(_("APPLICATION UPDATER"), Font::get(FONT_SIZE_LARGE), - mMenuColorTitle, ALIGN_CENTER); + mTitle = std::make_shared( + _("APPLICATION UPDATER"), + Font::get(FONT_SIZE_LARGE * Utils::Localization::sMenuTitleScaleFactor), mMenuColorTitle, + ALIGN_CENTER); mGrid.setEntry(mTitle, glm::ivec2 {0, 0}, false, true, glm::ivec2 {4, 1}, GridFlags::BORDER_BOTTOM); diff --git a/es-app/src/guis/GuiMetaDataEd.cpp b/es-app/src/guis/GuiMetaDataEd.cpp index 19c918325..0cca8dc8f 100644 --- a/es-app/src/guis/GuiMetaDataEd.cpp +++ b/es-app/src/guis/GuiMetaDataEd.cpp @@ -71,8 +71,9 @@ GuiMetaDataEd::GuiMetaDataEd(MetaDataList* md, addChild(&mBackground); addChild(&mGrid); - mTitle = std::make_shared(_("EDIT METADATA"), Font::get(FONT_SIZE_LARGE), - mMenuColorTitle, ALIGN_CENTER); + mTitle = std::make_shared( + _("EDIT METADATA"), Font::get(FONT_SIZE_LARGE * Utils::Localization::sMenuTitleScaleFactor), + mMenuColorTitle, ALIGN_CENTER); mGrid.setEntry(mTitle, glm::ivec2 {0, 0}, false, true, glm::ivec2 {2, 2}); // Extract possible subfolders from the path. diff --git a/es-app/src/guis/GuiOfflineGenerator.cpp b/es-app/src/guis/GuiOfflineGenerator.cpp index be83f8c05..de855514c 100644 --- a/es-app/src/guis/GuiOfflineGenerator.cpp +++ b/es-app/src/guis/GuiOfflineGenerator.cpp @@ -37,7 +37,9 @@ GuiOfflineGenerator::GuiOfflineGenerator(const std::queue& gameQueue) // Header. mTitle = std::make_shared( - _("MIXIMAGE OFFLINE GENERATOR"), Font::get(FONT_SIZE_LARGE), mMenuColorTitle, ALIGN_CENTER); + _("MIXIMAGE OFFLINE GENERATOR"), + Font::get(FONT_SIZE_LARGE * Utils::Localization::sMenuTitleScaleFactor), mMenuColorTitle, + ALIGN_CENTER); mGrid.setEntry(mTitle, glm::ivec2 {0, 0}, false, true, glm::ivec2 {6, 1}); mStatus = std::make_shared(_("NOT STARTED"), Font::get(FONT_SIZE_MEDIUM), diff --git a/es-app/src/guis/GuiOrphanedDataCleanup.cpp b/es-app/src/guis/GuiOrphanedDataCleanup.cpp index ddf6eeb5f..b6d2248ac 100644 --- a/es-app/src/guis/GuiOrphanedDataCleanup.cpp +++ b/es-app/src/guis/GuiOrphanedDataCleanup.cpp @@ -90,8 +90,10 @@ GuiOrphanedDataCleanup::GuiOrphanedDataCleanup(std::function reloadCallb } // Set up grid. - mTitle = std::make_shared(_("ORPHANED DATA CLEANUP"), Font::get(FONT_SIZE_LARGE), - mMenuColorTitle, ALIGN_CENTER); + mTitle = std::make_shared( + _("ORPHANED DATA CLEANUP"), + Font::get(FONT_SIZE_LARGE * Utils::Localization::sMenuTitleScaleFactor), mMenuColorTitle, + ALIGN_CENTER); mGrid.setEntry(mTitle, glm::ivec2 {0, 0}, false, true, glm::ivec2 {4, 1}, GridFlags::BORDER_NONE); diff --git a/es-app/src/guis/GuiScraperMulti.cpp b/es-app/src/guis/GuiScraperMulti.cpp index adc4a1bd1..fa5e7793a 100644 --- a/es-app/src/guis/GuiScraperMulti.cpp +++ b/es-app/src/guis/GuiScraperMulti.cpp @@ -49,8 +49,10 @@ GuiScraperMulti::GuiScraperMulti( mQueueCountPerSystem[(*it).first] = std::make_pair(0, (*it).second); // Set up grid. - mTitle = std::make_shared(_("SCRAPING IN PROGRESS"), Font::get(FONT_SIZE_LARGE), - mMenuColorTitle, ALIGN_CENTER); + mTitle = std::make_shared( + _("SCRAPING IN PROGRESS"), + Font::get(FONT_SIZE_LARGE * Utils::Localization::sMenuTitleScaleFactor), mMenuColorTitle, + ALIGN_CENTER); mGrid.setEntry(mTitle, glm::ivec2 {0, 0}, false, true, glm::ivec2 {2, 2}); mSystem = std::make_shared(_("SYSTEM"), Font::get(FONT_SIZE_MEDIUM), diff --git a/es-app/src/guis/GuiScraperSingle.cpp b/es-app/src/guis/GuiScraperSingle.cpp index 85b95813d..eb3fe8ca7 100644 --- a/es-app/src/guis/GuiScraperSingle.cpp +++ b/es-app/src/guis/GuiScraperSingle.cpp @@ -49,7 +49,8 @@ GuiScraperSingle::GuiScraperSingle(ScraperSearchParams& params, mGameName = std::make_shared( scrapeName + ((mSearchParams.game->getType() == FOLDER) ? " " + ViewController::FOLDER_CHAR : ""), - Font::get(FONT_SIZE_LARGE), mMenuColorPrimary, ALIGN_CENTER); + Font::get(FONT_SIZE_LARGE * Utils::Localization::sMenuTitleScaleFactor), mMenuColorPrimary, + ALIGN_CENTER); mGameName->setColor(mMenuColorTitle); mGrid.setEntry(mGameName, glm::ivec2 {0, 0}, false, true, glm::ivec2 {2, 2}); diff --git a/es-app/src/guis/GuiThemeDownloader.cpp b/es-app/src/guis/GuiThemeDownloader.cpp index 840998ddc..cfc1d17bf 100644 --- a/es-app/src/guis/GuiThemeDownloader.cpp +++ b/es-app/src/guis/GuiThemeDownloader.cpp @@ -45,8 +45,10 @@ GuiThemeDownloader::GuiThemeDownloader(std::function updateCallback) FONT_SIZE_SMALL}; // Set up main grid. - mTitle = std::make_shared(_("THEME DOWNLOADER"), Font::get(FONT_SIZE_LARGE), - mMenuColorTitle, ALIGN_CENTER); + mTitle = std::make_shared( + _("THEME DOWNLOADER"), + Font::get(FONT_SIZE_LARGE * Utils::Localization::sMenuTitleScaleFactor), mMenuColorTitle, + ALIGN_CENTER); mGrid.setEntry(mTitle, glm::ivec2 {0, 0}, false, true, glm::ivec2 {2, 2}, GridFlags::BORDER_BOTTOM); diff --git a/es-core/src/guis/GuiDetectDevice.cpp b/es-core/src/guis/GuiDetectDevice.cpp index 6ac8a4819..57cb03c38 100644 --- a/es-core/src/guis/GuiDetectDevice.cpp +++ b/es-core/src/guis/GuiDetectDevice.cpp @@ -35,9 +35,10 @@ GuiDetectDevice::GuiDetectDevice(bool firstRun, addChild(&mGrid); // Title. - mTitle = - std::make_shared(firstRun ? _("WELCOME") : _("CONFIGURE INPUT DEVICE"), - Font::get(FONT_SIZE_LARGE), mMenuColorTitle, ALIGN_CENTER); + mTitle = std::make_shared( + firstRun ? _("WELCOME") : _("CONFIGURE INPUT DEVICE"), + Font::get(FONT_SIZE_LARGE * Utils::Localization::sMenuTitleScaleFactor), mMenuColorTitle, + ALIGN_CENTER); mGrid.setEntry(mTitle, glm::ivec2 {0, 0}, false, true, glm::ivec2 {1, 1}, GridFlags::BORDER_BOTTOM); diff --git a/es-core/src/guis/GuiInputConfig.cpp b/es-core/src/guis/GuiInputConfig.cpp index f4a9c0f06..4282dacd8 100644 --- a/es-core/src/guis/GuiInputConfig.cpp +++ b/es-core/src/guis/GuiInputConfig.cpp @@ -54,8 +54,9 @@ GuiInputConfig::GuiInputConfig(InputConfig* target, // 0 is a spacer row. mGrid.setEntry(std::make_shared(), glm::ivec2 {0, 0}, false); - mTitle = std::make_shared(_("CONFIGURING"), Font::get(FONT_SIZE_LARGE), - mMenuColorTitle, ALIGN_CENTER); + mTitle = std::make_shared( + _("CONFIGURING"), Font::get(FONT_SIZE_LARGE * Utils::Localization::sMenuTitleScaleFactor), + mMenuColorTitle, ALIGN_CENTER); mGrid.setEntry(mTitle, glm::ivec2 {0, 1}, false, true); std::stringstream ss; diff --git a/es-core/src/guis/GuiTextEditKeyboardPopup.cpp b/es-core/src/guis/GuiTextEditKeyboardPopup.cpp index 65e812b6c..e39298b23 100644 --- a/es-core/src/guis/GuiTextEditKeyboardPopup.cpp +++ b/es-core/src/guis/GuiTextEditKeyboardPopup.cpp @@ -114,8 +114,9 @@ GuiTextEditKeyboardPopup::GuiTextEditKeyboardPopup( addChild(&mBackground); addChild(&mGrid); - mTitle = std::make_shared(title, Font::get(FONT_SIZE_LARGE), mMenuColorTitle, - ALIGN_CENTER); + mTitle = std::make_shared( + title, Font::get(FONT_SIZE_LARGE * Utils::Localization::sMenuTitleScaleFactor), + mMenuColorTitle, ALIGN_CENTER); std::vector> kbLayout; diff --git a/es-core/src/utils/LocalizationUtil.cpp b/es-core/src/utils/LocalizationUtil.cpp index 00da81b27..bd4b4224b 100644 --- a/es-core/src/utils/LocalizationUtil.cpp +++ b/es-core/src/utils/LocalizationUtil.cpp @@ -150,7 +150,11 @@ namespace Utils // Language-specific menu title scale factor. if (localePair.first == "sv") - sMenuTitleScaleFactor = 0.86f; + sMenuTitleScaleFactor = 0.87f; + else if (localePair.first == "el") + sMenuTitleScaleFactor = 0.92f; + else if (localePair.first == "zh") + sMenuTitleScaleFactor = 0.94f; std::string localePath; localePath.append("/")