mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libweston-desktop: Fix configure event for already well-sized surfaces

Browse Source 
Even if the surface size is already correct, we need to store the
configured size in case some other state change triggers a configure
event.

Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Reviewed-by: Arnaud Vrac <avrac@freebox.fr>
This commit is contained in:
Quentin Glidic 2016-09-13 10:05:58 +02:00
parent 870f384d0e
commit a56b053ee1
No known key found for this signature in database
GPG Key ID: AC203F96E2C34BB7
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libweston-desktop/wl-shell.c
View File

@ -67,8 +67,8 @@ weston_desktop_wl_shell_surface_set_size(struct weston_desktop_surface *dsurface
struct weston_surface *wsurface =
weston_desktop_surface_get_surface(surface->surface);
if (wsurface->width == width && wsurface->height == height)
return;
if ((wsurface->width == width && wsurface->height == height) ||
(width == 0 && height == 0))
wl_shell_surface_send_configure(surface->resource,
WL_SHELL_SURFACE_RESIZE_NONE,

8
libweston-desktop/xdg-shell-v5.c
View File

@ -192,11 +192,13 @@ weston_desktop_xdg_surface_set_size(struct weston_desktop_surface *dsurface,
struct weston_desktop_xdg_surface *surface = user_data;
struct weston_surface *wsurface = weston_desktop_surface_get_surface(surface->surface);
if (wsurface->width == width && wsurface->height == height)
return;
surface->requested_size.width = width;
surface->requested_size.height = height;
if ((wsurface->width == width && wsurface->height == height) ||
(width == 0 && height == 0))
return;
weston_desktop_xdg_surface_schedule_configure(surface);
}

8
libweston-desktop/xdg-shell-v6.c
View File

@ -607,11 +607,13 @@ weston_desktop_xdg_toplevel_set_size(struct weston_desktop_surface *dsurface,
struct weston_surface *wsurface =
weston_desktop_surface_get_surface(toplevel->base.desktop_surface);
if (wsurface->width == width && wsurface->height == height)
return;
toplevel->requested_size.width = width;
toplevel->requested_size.height = height;
if ((wsurface->width == width && wsurface->height == height) ||
(width == 0 && height == 0))
return;
weston_desktop_xdg_surface_schedule_configure(&toplevel->base);
}