From 7d2fc9291b505cf0df2618686bb885a3219f1435 Mon Sep 17 00:00:00 2001 From: Pekka Paalanen Date: Wed, 18 Oct 2017 12:18:39 +0300 Subject: compositor-wayland: allow to unset fullscreen To be more symmetric with wayland_output_set_fullscreen(), implement the xdg-shell path in wayland_output_set_windowed(). This should make it possible to use the fullscreen key binding to toggle between a floating window and fullscreen also under xdg-shell. Signed-off-by: Pekka Paalanen Reviewed-by: Quentin Glidic Acked-by: Daniel Stone --- libweston/compositor-wayland.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libweston/compositor-wayland.c b/libweston/compositor-wayland.c index 9486deae..4266bb64 100644 --- a/libweston/compositor-wayland.c +++ b/libweston/compositor-wayland.c @@ -873,8 +873,11 @@ wayland_output_set_windowed(struct wayland_output *output) wayland_output_resize_surface(output); - if (output->parent.shell_surface) + if (output->parent.xdg_toplevel) { + zxdg_toplevel_v6_unset_fullscreen(output->parent.xdg_toplevel); + } else if (output->parent.shell_surface) { wl_shell_surface_set_toplevel(output->parent.shell_surface); + } return 0; } -- cgit v1.2.3