encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wayland: Only commit on move if the display was changed 

Only commit on a move event if the display was changed for a fullscreen window and the compositor has returned bad dimensions.
This commit is contained in:
Frank Praznik 2022-09-09 14:26:44 -04:00 committed by Sam Lantinga
parent 97a5e74449
commit edfb00c25e
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/video/wayland/SDL_waylandwindow.c
View File

@ -1032,8 +1032,9 @@ static void
Wayland_move_window(SDL_Window *window, Wayland_move_window(SDL_Window *window,
SDL_WaylandOutputData *driverdata) SDL_WaylandOutputData *driverdata)
{ {
SDL_WindowData *wind = (SDL_WindowData*)window; SDL_WindowData *wind = (SDL_WindowData*)window->driverdata;
SDL_VideoDisplay *display; SDL_VideoDisplay *display;
SDL_bool fs_display_changed = SDL_FALSE;
int i, j; int i, j;
const int numdisplays = SDL_GetNumVideoDisplays(); const int numdisplays = SDL_GetNumVideoDisplays();
for (i = 0; i < numdisplays; i += 1) { for (i = 0; i < numdisplays; i += 1) {
@ -1058,6 +1059,7 @@ Wayland_move_window(SDL_Window *window,
} }
display->fullscreen_window = window; display->fullscreen_window = window;
fs_display_changed = SDL_TRUE;
} }
/* We want to send a very very specific combination here: /* We want to send a very very specific combination here:
@ -1083,10 +1085,11 @@ Wayland_move_window(SDL_Window *window,
SDL_SendWindowEvent(window, SDL_WINDOWEVENT_MOVED, bounds.x, bounds.y); SDL_SendWindowEvent(window, SDL_WINDOWEVENT_MOVED, bounds.x, bounds.y);
/* /*
* We should have gotten the new output size from the compositor, but if not, * If the fullscreen output was changed, and we have bad dimensions from
* commit with the dimensions with the new display. * the compositor, commit with the dimensions of the new display.
*/ */
if (!wind->fs_output_width || !wind->fs_output_height) { if (fs_display_changed &&
(!wind->fs_output_width || !wind->fs_output_height)) {
ConfigureWindowGeometry(window); ConfigureWindowGeometry(window);
CommitWindowGeometry(window); CommitWindowGeometry(window);
} }