Merge remote-tracking branch 'upstream/master' into output-damage

This commit is contained in:
emersion 2018-02-09 14:50:26 +01:00
commit cdd55b5d19
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
8 changed files with 86 additions and 43 deletions

View file

@ -147,7 +147,7 @@ static void move_resize(struct roots_view *view, double x, double y,
constrained_height);
if (serial > 0) {
roots_surface->pending_move_resize_configure_serial = serial;
} else {
} else if (roots_surface->pending_move_resize_configure_serial == 0) {
view_update_position(view, x, y);
}
}