BramReuling/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-06-06 14:43:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

wayland: Prevent popup configure events from overwriting the current size with old data

Browse source 
Don't apply the supplied dimensions if they haven't changed from the last configuration event, or a newer size set programmatically can be overwritten by old data.

This check is already being done for toplevel windows, but was never added to the popup configure event.
This commit is contained in:
Frank Praznik 2024-12-28 14:15:40 -05:00
parent c714b1a38b
commit 5acd7fe208
1 changed files with 24 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/video/wayland/SDL_waylandwindow.c
View file

@ -1026,16 +1026,32 @@ static void handle_configure_xdg_popup(void *data,
x -= offset_x;
y -= offset_y;
wind->requested.logical_width = width;
wind->requested.logical_height = height;
if (wind->scale_to_display) {
x = PointToPixel(wind->sdlwindow->parent, x);
y = PointToPixel(wind->sdlwindow->parent, y);
wind->requested.pixel_width = PointToPixel(wind->sdlwindow, width);
wind->requested.pixel_height = PointToPixel(wind->sdlwindow, height);
/* This happens when the compositor indicates that the size is
* up to the client, so use the cached window size here.
*/
if (width == 0 || height == 0) {
width = wind->sdlwindow->floating.w;
height = wind->sdlwindow->floating.h;
}
/* Don't apply the supplied dimensions if they haven't changed from the last configuration
* event, or a newer size set programmatically can be overwritten by old data.
*/
if (width != wind->last_configure.width || height != wind->last_configure.height) {
wind->requested.logical_width = width;
wind->requested.logical_height = height;
if (wind->scale_to_display) {
x = PointToPixel(wind->sdlwindow->parent, x);
y = PointToPixel(wind->sdlwindow->parent, y);
wind->requested.pixel_width = PointToPixel(wind->sdlwindow, width);
wind->requested.pixel_height = PointToPixel(wind->sdlwindow, height);
}
}
wind->last_configure.width = width;
wind->last_configure.height = height;
SDL_SendWindowEvent(wind->sdlwindow, SDL_EVENT_WINDOW_MOVED, x, y);
if (wind->shell_surface_status == WAYLAND_SHELL_SURFACE_STATUS_WAITING_FOR_CONFIGURE) {