diff options
| author | Pekka Paalanen <pekka.paalanen@collabora.co.uk> | 2017-10-18 12:18:39 +0300 |
|---|---|---|
| committer | Pekka Paalanen <pekka.paalanen@collabora.co.uk> | 2017-10-24 12:51:35 +0300 |
| commit | 7d2fc9291b505cf0df2618686bb885a3219f1435 (patch) | |
| tree | 64450914b86934945330512cb3fcb9bca59c8509 | |
| parent | f13227945515f3d2f654573bda861505e86e6ffa (diff) | |
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 <pekka.paalanen@collabora.co.uk>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Acked-by: Daniel Stone <daniels@collabora.com>
| -rw-r--r-- | libweston/compositor-wayland.c | 5 |
1 files changed, 4 insertions, 1 deletions
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; } |