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

desktop-shell: Set surface resizing state during interactive resize

Browse Source 
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>
This commit is contained in:
Philipp Kerling
2017-07-28 14:11:58 +02:00
committed by Quentin Glidic
parent e3715527b9
commit c5f1241695
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop-shell/shell.c
+7
View 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_resize_grab *resize = (struct weston_resize_grab *) grab;
struct weston_pointer *pointer = grab->pointer; struct weston_pointer *pointer = grab->pointer;
enum wl_pointer_button_state state = state_w; enum wl_pointer_button_state state = state_w;
struct weston_desktop_surface *desktop_surface =
resize->base.shsurf->desktop_surface;
if (pointer->button_count == 0 && if (pointer->button_count == 0 &&
state == WL_POINTER_BUTTON_STATE_RELEASED) { state == WL_POINTER_BUTTON_STATE_RELEASED) {
weston_desktop_surface_set_resizing(desktop_surface, false);
shell_grab_end(&resize->base); shell_grab_end(&resize->base);
free(grab); free(grab);
} }
@@ -1647,7 +1650,10 @@ static void
resize_grab_cancel(struct weston_pointer_grab *grab) resize_grab_cancel(struct weston_pointer_grab *grab)
{ {
struct weston_resize_grab *resize = (struct weston_resize_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); shell_grab_end(&resize->base);
free(grab); free(grab);
} }
@@ -1731,6 +1737,7 @@ surface_resize(struct shell_surface *shsurf,
resize->height = geometry.height; resize->height = geometry.height;
shsurf->resize_edges = edges; shsurf->resize_edges = edges;
weston_desktop_surface_set_resizing(shsurf->desktop_surface, true);
shell_grab_start(&resize->base, &resize_grab_interface, shsurf, shell_grab_start(&resize->base, &resize_grab_interface, shsurf,
pointer, edges); pointer, edges);