games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-15 20:03:15 +02:00
Code Issues Releases Activity

iOS can use any resolution

Browse Source
This commit is contained in:
Andrey Filipenkov
2022-09-26 16:59:59 +03:00
parent 063f80fac3
commit 76b36b8951
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/windows/GUIClasses.cpp
View File

@@ -562,14 +562,18 @@ void CSystemOptionsWindow::selectGameRes()
std::vector<std::string> items; std::vector<std::string> items;
const JsonNode & texts = CGI->generaltexth->localizedTexts["systemOptions"]["resolutionMenu"]; const JsonNode & texts = CGI->generaltexth->localizedTexts["systemOptions"]["resolutionMenu"];
#ifndef VCMI_IOS
SDL_Rect displayBounds; SDL_Rect displayBounds;
SDL_GetDisplayBounds(std::max(0, SDL_GetWindowDisplayIndex(mainWindow)), &displayBounds); SDL_GetDisplayBounds(std::max(0, SDL_GetWindowDisplayIndex(mainWindow)), &displayBounds);
#endif
for(const auto & it : conf.guiOptions) for(const auto & it : conf.guiOptions)
{ {
const auto & resolution = it.first; const auto & resolution = it.first;
#ifndef VCMI_IOS
if(displayBounds.w < resolution.first || displayBounds.h < resolution.second) if(displayBounds.w < resolution.first || displayBounds.h < resolution.second)
continue; continue;
#endif
std::string resX = boost::lexical_cast<std::string>(resolution.first); std::string resX = boost::lexical_cast<std::string>(resolution.first);
std::string resY = boost::lexical_cast<std::string>(resolution.second); std::string resY = boost::lexical_cast<std::string>(resolution.second);

2
launcher/settingsView/csettingsview_moc.cpp
View File

@@ -137,8 +137,10 @@ void CSettingsView::fillValidResolutionsForScreen(int screenIndex)
continue; continue;
const QSize resolution{widthValue.toInt(), heightValue.toInt()}; const QSize resolution{widthValue.toInt(), heightValue.toInt()};
#ifndef VCMI_IOS
if(screenSize.width() < resolution.width() || screenSize.height() < resolution.height()) if(screenSize.width() < resolution.width() || screenSize.height() < resolution.height())
continue; continue;
#endif
ui->comboBoxResolution->addItem(resolutionToString(resolution)); ui->comboBoxResolution->addItem(resolutionToString(resolution));
} }