thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SDL: Use the window display index when querying display modes

Browse source
This commit is contained in:
SupSuper 2021-04-29 05:18:37 +01:00 • committed by Filippos Karapetis
parent 41798fca5d
commit 60f1fd98aa
6 changed files with 27 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

16
backends/graphics/sdl/sdl-graphics.h
View file

@ -179,17 +179,6 @@ protected:
}
#endif
}
/**
* Gets the display index that the ScummVM window is on
*/
void getWindowDisplayIndexFromSdl(int *index) const {
#if SDL_VERSION_ATLEAST(2, 0, 0)
assert(_window);
*index = SDL_GetWindowDisplayIndex(_window->getSDLWindow());
#else
*index = 0;
#endif
}
void getDisplayDpiFromSdl(float *dpi, float *defaultDpi) const {
const float systemDpi =
@ -205,10 +194,7 @@ protected:
if (dpi) {
#if SDL_VERSION_ATLEAST(2, 0, 4)
int displayIndex = 0;
getWindowDisplayIndexFromSdl(&displayIndex);
if (SDL_GetDisplayDPI(displayIndex, NULL, dpi, NULL) != 0) {
if (SDL_GetDisplayDPI(_window->getDisplayIndex(), NULL, dpi, NULL) != 0) {
*dpi = systemDpi;
}
#else