mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Fix: [SDL2] only resolutions of the first display were shown (#11778)

pull/11782/head
Patric Stout 2024-01-14 23:25:54 +01:00 committed by GitHub
parent 994bdff81e
commit 302ba93471
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gfx.cpp
View File

@ -1779,6 +1779,10 @@ bool ToggleFullScreen(bool fs)
void SortResolutions() void SortResolutions()
{ {
std::sort(_resolutions.begin(), _resolutions.end()); std::sort(_resolutions.begin(), _resolutions.end());
/* Remove any duplicates from the list. */
auto last = std::unique(_resolutions.begin(), _resolutions.end());
_resolutions.erase(last, _resolutions.end());
} }
/** /**

14
src/video/sdl2_v.cpp
View File

@ -59,13 +59,15 @@ static void FindResolutions()
{ {
_resolutions.clear(); _resolutions.clear();
for (int i = 0; i < SDL_GetNumDisplayModes(0); i++) { for (int display = 0; display < SDL_GetNumVideoDisplays(); display++) {
SDL_DisplayMode mode; for (int i = 0; i < SDL_GetNumDisplayModes(display); i++) {
SDL_GetDisplayMode(0, i, &mode); SDL_DisplayMode mode;
SDL_GetDisplayMode(display, i, &mode);
if (mode.w < 640 || mode.h < 480) continue; if (mode.w < 640 || mode.h < 480) continue;
if (std::find(_resolutions.begin(), _resolutions.end(), Dimension(mode.w, mode.h)) != _resolutions.end()) continue; if (std::find(_resolutions.begin(), _resolutions.end(), Dimension(mode.w, mode.h)) != _resolutions.end()) continue;
_resolutions.emplace_back(mode.w, mode.h); _resolutions.emplace_back(mode.w, mode.h);
}
} }
/* We have found no resolutions, show the default list */ /* We have found no resolutions, show the default list */