gallant/SDL2
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

video: Don't resize moved, fullscreen windows when mode switching is being emulated

Browse source 
When a driver is emulating mode changes, the display bounds are always the native desktop size, not those of the video mode being emulated. This can result in incorrectly setting the size of fullscreen Wayland windows. Don't resize fullscreen windows to the display dimensions when mode switching is emulated.

Renames the quirk flag from VIDEO_DEVICE_QUIRK_DISABLE_DISPLAY_MODE_SWITCHING to VIDEO_DEVICE_QUIRK_MODE_SWITCHING_EMULATED to better reflect its purpose.
This commit is contained in:
Frank Praznik 2023-01-19 14:02:09 -05:00 committed by Sam Lantinga
parent 5ba9e07366
commit 5d5d39b190
3 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/video/SDL_sysvideo.h
View file

@ -143,7 +143,7 @@ struct SDL_SysWMinfo;
/* Video device flags */
typedef enum
{
VIDEO_DEVICE_QUIRK_DISABLE_DISPLAY_MODE_SWITCHING = 0x01,
VIDEO_DEVICE_QUIRK_MODE_SWITCHING_EMULATED = 0x01,
VIDEO_DEVICE_QUIRK_DISABLE_UNSET_FULLSCREEN_ON_MINIMIZE = 0x02,
} DeviceQuirkFlags;

17
src/video/SDL_video.c
View file

@ -160,9 +160,9 @@ extern SDL_bool Cocoa_SetWindowFullscreenSpace(SDL_Window *window, SDL_bool stat
#endif
/* Convenience functions for reading driver flags */
static SDL_bool DisableDisplayModeSwitching(_THIS)
static SDL_bool ModeSwitchingEmulated(_THIS)
{
return !!(_this->quirk_flags & VIDEO_DEVICE_QUIRK_DISABLE_DISPLAY_MODE_SWITCHING);
return !!(_this->quirk_flags & VIDEO_DEVICE_QUIRK_MODE_SWITCHING_EMULATED);
}
static SDL_bool DisableUnsetFullscreenOnMinimize(_THIS)
@ -1019,8 +1019,8 @@ static int SDL_SetDisplayModeForDisplay(SDL_VideoDisplay *display, const SDL_Dis
SDL_DisplayMode current_mode;
int result;
/* Mode switching disabled via driver quirk flag, nothing to do and cannot fail. */
if (DisableDisplayModeSwitching(_this)) {
/* Mode switching set as emulated via driver quirk flag, nothing to do and cannot fail. */
if (ModeSwitchingEmulated(_this)) {
return 0;
}
@ -2929,7 +2929,12 @@ void SDL_OnWindowDisplayChanged(SDL_Window *window)
SDL_UpdateFullscreenMode(window, SDL_TRUE);
}
if (SDL_GetDisplayBounds(window->display_index, &rect) == 0) {
/*
* If mode switching is being emulated, the display bounds don't necessarily reflect the
* emulated mode dimensions since the window is just being scaled.
*/
if (!ModeSwitchingEmulated(_this) &&
SDL_GetDisplayBounds(window->display_index, &rect) == 0) {
int old_w = window->w;
int old_h = window->h;
window->x = rect.x;
@ -3050,7 +3055,7 @@ static SDL_bool SDL_ShouldMinimizeOnFocusLoss(SDL_Window *window)
hint = SDL_GetHint(SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS);
if (hint == NULL || !*hint || SDL_strcasecmp(hint, "auto") == 0) {
if ((window->flags & SDL_WINDOW_FULLSCREEN_DESKTOP) == SDL_WINDOW_FULLSCREEN_DESKTOP ||
DisableDisplayModeSwitching(_this) == SDL_TRUE) {
ModeSwitchingEmulated(_this) == SDL_TRUE) {
return SDL_FALSE;
} else {
return SDL_TRUE;

2
src/video/wayland/SDL_waylandvideo.c
View file

@ -272,7 +272,7 @@ static SDL_VideoDevice *Wayland_CreateDevice(void)
device->free = Wayland_DeleteDevice;
device->quirk_flags = VIDEO_DEVICE_QUIRK_DISABLE_DISPLAY_MODE_SWITCHING |
device->quirk_flags = VIDEO_DEVICE_QUIRK_MODE_SWITCHING_EMULATED |
VIDEO_DEVICE_QUIRK_DISABLE_UNSET_FULLSCREEN_ON_MINIMIZE;
return device;