desktop-shell: Set surface resizing state during interactive resize
authorPhilipp Kerling <pkerling@casix.org>
Fri, 28 Jul 2017 12:11:58 +0000 (14:11 +0200)
committerQuentin Glidic <sardemff7+git@sardemff7.net>
Fri, 28 Jul 2017 12:46:10 +0000 (14:46 +0200)
xdg_shell requires this information to be shared with the client in
order to conform with the specification.

The code to forward this to the client by way of a configure() event
is already in place and works fine, it was just never being used until
now.

Signed-off-by: Philipp Kerling <pkerling@casix.org>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
desktop-shell/shell.c

index 4608cf2fa0cf37a8b2f1f931e8d54379b56a2d0d..415da1928177581c00c1317161fc0de28a0e35bc 100644 (file)
@@ -1635,9 +1635,12 @@ resize_grab_button(struct weston_pointer_grab *grab,
        struct weston_resize_grab *resize = (struct weston_resize_grab *) grab;
        struct weston_pointer *pointer = grab->pointer;
        enum wl_pointer_button_state state = state_w;
+       struct weston_desktop_surface *desktop_surface =
+               resize->base.shsurf->desktop_surface;
 
        if (pointer->button_count == 0 &&
            state == WL_POINTER_BUTTON_STATE_RELEASED) {
+               weston_desktop_surface_set_resizing(desktop_surface, false);
                shell_grab_end(&resize->base);
                free(grab);
        }
@@ -1647,7 +1650,10 @@ static void
 resize_grab_cancel(struct weston_pointer_grab *grab)
 {
        struct weston_resize_grab *resize = (struct weston_resize_grab *) grab;
+       struct weston_desktop_surface *desktop_surface =
+               resize->base.shsurf->desktop_surface;
 
+       weston_desktop_surface_set_resizing(desktop_surface, false);
        shell_grab_end(&resize->base);
        free(grab);
 }
@@ -1731,6 +1737,7 @@ surface_resize(struct shell_surface *shsurf,
        resize->height = geometry.height;
 
        shsurf->resize_edges = edges;
+       weston_desktop_surface_set_resizing(shsurf->desktop_surface, true);
        shell_grab_start(&resize->base, &resize_grab_interface, shsurf,
                         pointer, edges);