cpp/openttd-patchpack/source Changeset - r28456:526c217dbaa8

Changeset - r28456:526c217dbaa8

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

Patric Stout - 11 months ago 2024-01-14 22:25:54
truebrain@openttd.org

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

2 files changed with 12 insertions and 6 deletions:

src/gfx.cpp

src/video/sdl2_v.cpp

0 comments (0 inline, 0 general)

src/gfx.cpp

➞

Show inline comments

@@ @@ -1776,12 +1776,16 @@ bool ToggleFullScreen(bool fs) @@
 	return result;
+}
 void SortResolutions()
+{
 	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());
+}
 /**
  * Resolve GUI zoom level, if auto-suggestion is requested.
  */
 void UpdateGUIZoom()

src/video/sdl2_v.cpp

➞

Show inline comments

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

0 comments (0 inline, 0 general)