mirror of
https://github.com/libsdl-org/SDL.git
synced 2026-06-05 22:30:29 +00:00
Merge e4926dd950 into 79de30a345
This commit is contained in:
commit
a78a6499b8
1 changed files with 7 additions and 0 deletions
|
|
@ -1344,6 +1344,12 @@ int SDL_GetWindowDisplayMode(SDL_Window *window, SDL_DisplayMode *mode)
|
||||||
|
|
||||||
display = SDL_GetDisplayForWindow(window);
|
display = SDL_GetDisplayForWindow(window);
|
||||||
|
|
||||||
|
#ifdef __ANDROID__
|
||||||
|
/* Android does not support native resolution changes (SDL_WINDOW_FULLSCREEN) */
|
||||||
|
if((window->flags & FULLSCREEN_MASK) != 0) {
|
||||||
|
fullscreen_mode = display->desktop_mode;
|
||||||
|
}
|
||||||
|
#else
|
||||||
/* if in desktop size mode, just return the size of the desktop */
|
/* if in desktop size mode, just return the size of the desktop */
|
||||||
if ((window->flags & SDL_WINDOW_FULLSCREEN_DESKTOP) == SDL_WINDOW_FULLSCREEN_DESKTOP) {
|
if ((window->flags & SDL_WINDOW_FULLSCREEN_DESKTOP) == SDL_WINDOW_FULLSCREEN_DESKTOP) {
|
||||||
fullscreen_mode = display->desktop_mode;
|
fullscreen_mode = display->desktop_mode;
|
||||||
|
|
@ -1353,6 +1359,7 @@ int SDL_GetWindowDisplayMode(SDL_Window *window, SDL_DisplayMode *mode)
|
||||||
SDL_zerop(mode);
|
SDL_zerop(mode);
|
||||||
return SDL_SetError("Couldn't find display mode match");
|
return SDL_SetError("Couldn't find display mode match");
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
*mode = fullscreen_mode;
|
*mode = fullscreen_mode;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue